diff options
| author | Cracker64 <cracker642@gmail.com> | 2010-12-19 05:51:25 (GMT) |
|---|---|---|
| committer | Cracker64 <cracker642@gmail.com> | 2010-12-19 05:51:25 (GMT) |
| commit | ee4bb84395f2e8aaa9e9af7080f03d837b0a0344 (patch) | |
| tree | 7495e92121722f9b9a3371343cb3e5d9b80f59f0 /src | |
| parent | 2dad930818bc97391d7b19064090b3169f57cec6 (diff) | |
| download | powder-ee4bb84395f2e8aaa9e9af7080f03d837b0a0344.zip powder-ee4bb84395f2e8aaa9e9af7080f03d837b0a0344.tar.gz | |
missed some parenthesis, caused some creating problems
Diffstat (limited to 'src')
| -rw-r--r-- | src/powder.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/powder.c b/src/powder.c index f5787ca..fca05a4 100644 --- a/src/powder.c +++ b/src/powder.c @@ -185,11 +185,31 @@ int try_move(int i, int x, int y, int nx, int ny) if((r&0xFF)==PT_VOID) { + if(parts[i].type == PT_STKM) + { + death = 1; + isplayer = 0; + } + if(parts[i].type == PT_STKM2) + { + death2 = 1; + isplayer2 = 0; + } parts[i].type=PT_NONE; return 0; } if((r&0xFF)==PT_BHOL) { + if(parts[i].type == PT_STKM) + { + death = 1; + isplayer = 0; + } + if(parts[i].type == PT_STKM2) + { + death2 = 1; + isplayer2 = 0; + } parts[i].type=PT_NONE; if(!legacy_enable) { @@ -494,7 +514,7 @@ inline int create_part(int p, int x, int y, int t) if(p==-1)//creating from anything but brush { if(pmap[y][x]) - if(pmap[y][x]&0xFF!=PT_SPAWN&&pmap[y][x]&0xFF!=PT_SPAWN2) + if((pmap[y][x]&0xFF)!=PT_SPAWN&&(pmap[y][x]&0xFF)!=PT_SPAWN2) if(t!=PT_STKM&&t!=PT_STKM2) return -1; if(pfree == -1) |