summaryrefslogtreecommitdiff
path: root/powder.c
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2010-09-10 20:13:29 (GMT)
committer Simon <simon@hardwired.org.uk>2010-09-10 20:13:29 (GMT)
commitd640bd26d8b7f5b53f0f685e53ce5181f349fad4 (patch)
tree65da488b66efb8560514afbdc9b9dec734030acc /powder.c
parentb89be2174921dc4f4e15911ce59546ef16f65dd6 (diff)
downloadpowder-d640bd26d8b7f5b53f0f685e53ce5181f349fad4.zip
powder-d640bd26d8b7f5b53f0f685e53ce5181f349fad4.tar.gz
Some changes
Diffstat (limited to 'powder.c')
-rw-r--r--powder.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/powder.c b/powder.c
index 770e877..449693f 100644
--- a/powder.c
+++ b/powder.c
@@ -63,7 +63,7 @@ int try_move(int i, int x, int y, int nx, int ny)
{
return 1;
}
- if(bmap[ny/CELL][nx/CELL]==13 && ptypes[parts[i].type].falldown!=0 && parts[i].type!=PT_FIRE)
+ if(bmap[ny/CELL][nx/CELL]==13 && ptypes[parts[i].type].falldown!=0 && parts[i].type!=PT_FIRE && parts[i].type!=PT_SMKE)
{
return 0;
}
@@ -514,6 +514,7 @@ void update_particles_i(pixel *vid, int start, int inc)
(bmap[y/CELL][x/CELL]==2) ||
(bmap[y/CELL][x/CELL]==3 && ptypes[t].falldown!=2) ||
(bmap[y/CELL][x/CELL]==10 && ptypes[t].falldown!=1) ||
+ (bmap[y/CELL][x/CELL]==13 && ptypes[t].falldown!=0 && parts[i].type!=PT_FIRE && parts[i].type!=PT_SMKE) ||
(bmap[y/CELL][x/CELL]==6 && (t==PT_METL || t==PT_SPRK)) ||
(bmap[y/CELL][x/CELL]==7 && !emap[y/CELL][x/CELL])) && (t!=PT_STKM)))
{