diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-08-18 12:44:09 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-08-19 11:23:38 (GMT) |
| commit | 961a393c7a20166277c10aebde43e7563951773a (patch) | |
| tree | 835f2ba00af186cd8577ad0edbecf2569700a4b9 /src/powder.c | |
| parent | 34abbcc84ccbefac065a8c7afd62ce272b3e51ec (diff) | |
| download | powder-961a393c7a20166277c10aebde43e7563951773a.zip powder-961a393c7a20166277c10aebde43e7563951773a.tar.gz | |
Modify GBMB to only use life
tmp not needed, since it doesn't create powder during an explosion like BOMB does.
Diffstat (limited to 'src/powder.c')
| -rw-r--r-- | src/powder.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/powder.c b/src/powder.c index abff116..9433aea 100644 --- a/src/powder.c +++ b/src/powder.c @@ -336,6 +336,9 @@ int try_move(int i, int x, int y, int nx, int ny) if ((bmap[y/CELL][x/CELL]==WL_EHOLE && !emap[y/CELL][x/CELL]) && !(bmap[ny/CELL][nx/CELL]==WL_EHOLE && !emap[ny/CELL][nx/CELL])) return 0; + if(parts[i].type==PT_GBMB&&parts[i].life>0) + return 0; + e = r >> 8; //e is now the particle number at r (pmap[ny][nx]) if (r && e<NPART)//the swap part, if we make it this far, swap { @@ -364,8 +367,6 @@ int try_move(int i, int x, int y, int nx, int ny) parts[e].y += y-ny; pmap[(int)(parts[e].y+0.5f)][(int)(parts[e].x+0.5f)] = (e<<8)|parts[e].type; } - if(parts[i].type==PT_GBMB&&parts[i].tmp==1) - return 0; return 1; } |