From ee4bb84395f2e8aaa9e9af7080f03d837b0a0344 Mon Sep 17 00:00:00 2001 From: Cracker64 Date: Sun, 19 Dec 2010 00:51:25 -0500 Subject: [PATCH] missed some parenthesis, caused some creating problems --- src/powder.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/powder.c b/src/powder.c index f5787ca24..fca05a493 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)