summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcracker64 <cracker642@gmail.com>2011-09-23 14:17:41 (GMT)
committer cracker64 <cracker642@gmail.com>2011-09-23 14:17:41 (GMT)
commit07f808790732854cd258d1e0d09ef9b3fd8cf142 (patch)
tree03c168cddead98caa38bd1d21291f7efde19c29f /src
parent24b4478136ff0919cff0c62ace2deb173b879472 (diff)
downloadpowder-07f808790732854cd258d1e0d09ef9b3fd8cf142.zip
powder-07f808790732854cd258d1e0d09ef9b3fd8cf142.tar.gz
Prevent water equalization from moving onto particles.
Diffstat (limited to 'src')
-rw-r--r--src/powder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/powder.c b/src/powder.c
index 591f650..a97c51d 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -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) && eval_move(parts[i].type, x, y-1, NULL))
+ if ( ((y-1) > originaly) && !pmap[y-1][x] && 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);