diff options
| author | cracker64 <cracker642@gmail.com> | 2011-09-22 02:05:19 (GMT) |
|---|---|---|
| committer | cracker64 <cracker642@gmail.com> | 2011-09-22 02:05:19 (GMT) |
| commit | 848fa77a829f5257bc72796d3281b91a925787dc (patch) | |
| tree | 4942880150a5361f1fa1ae502d806309d41cc87b /src | |
| parent | eb646ce1d6398b559ad04f4d29e351503163fbad (diff) | |
| download | powder-848fa77a829f5257bc72796d3281b91a925787dc.zip powder-848fa77a829f5257bc72796d3281b91a925787dc.tar.gz | |
Fix walls with water equalization.
Also annoying inlines for visual studio.
Diffstat (limited to 'src')
| -rw-r--r-- | src/misc.c | 6 | ||||
| -rw-r--r-- | src/powder.c | 8 |
2 files changed, 7 insertions, 7 deletions
@@ -26,7 +26,7 @@ char *clipboard_text = NULL; //Signum function #if defined(WIN32) && !defined(__GNUC__) -_inline int isign(float i) +int isign(float i) #else inline int isign(float i) #endif @@ -39,7 +39,7 @@ inline int isign(float i) } #if defined(WIN32) && !defined(__GNUC__) -_inline unsigned clamp_flt(float f, float min, float max) +unsigned clamp_flt(float f, float min, float max) #else inline unsigned clamp_flt(float f, float min, float max) #endif @@ -52,7 +52,7 @@ inline unsigned clamp_flt(float f, float min, float max) } #if defined(WIN32) && !defined(__GNUC__) -_inline float restrict_flt(float f, float min, float max) +float restrict_flt(float f, float min, float max) #else inline float restrict_flt(float f, float min, float max) #endif diff --git a/src/powder.c b/src/powder.c index e5927ed..6b4184c 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1217,7 +1217,7 @@ void set_emap(int x, int y) } #if defined(WIN32) && !defined(__GNUC__) -_inline int parts_avg(int ci, int ni,int t)//t is the particle you are looking for, returns the particle between two particles +int parts_avg(int ci, int ni,int t)//t is the particle you are looking for, returns the particle between two particles #else inline int parts_avg(int ci, int ni,int t) #endif @@ -2675,7 +2675,7 @@ int flood_water(int x, int y, int i, int originaly, int check) { parts[pmap[y][x]>>8].tmp2 = !check;//flag it as checked, maybe shouldn't use .tmp2 //check above, maybe around other sides too? - if ( ((y-1) > originaly) && !pmap[y-1][x]) + if ( ((y-1) > originaly) && eval_move(parts[i].type, x, y-1, NULL)) { int oldx = (int)(parts[i].x + 0.5f); int oldy = (int)(parts[i].y + 0.5f); @@ -3080,7 +3080,7 @@ void *transform_save(void *odata, int *size, matrix2d transform, vector2d transl } #if defined(WIN32) && !defined(__GNUC__) -_inline void orbitalparts_get(int block1, int block2, int resblock1[], int resblock2[]) +void orbitalparts_get(int block1, int block2, int resblock1[], int resblock2[]) #else inline void orbitalparts_get(int block1, int block2, int resblock1[], int resblock2[]) #endif @@ -3097,7 +3097,7 @@ inline void orbitalparts_get(int block1, int block2, int resblock1[], int resblo } #if defined(WIN32) && !defined(__GNUC__) -_inline void orbitalparts_set(int *block1, int *block2, int resblock1[], int resblock2[]) +void orbitalparts_set(int *block1, int *block2, int resblock1[], int resblock2[]) #else inline void orbitalparts_set(int *block1, int *block2, int resblock1[], int resblock2[]) #endif |