diff options
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/bomb.cpp | 2 | ||||
| -rw-r--r-- | src/elements/newgraphics.cpp | 2 | ||||
| -rw-r--r-- | src/elements/stkm.cpp | 1 | ||||
| -rw-r--r-- | src/elements/wire.cpp | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/src/elements/bomb.cpp b/src/elements/bomb.cpp index b696b19..3b6db26 100644 --- a/src/elements/bomb.cpp +++ b/src/elements/bomb.cpp @@ -11,7 +11,7 @@ int update_BOMB(UPDATE_FUNC_ARGS) { r = pmap[y+ry][x+rx]; if (!r) continue; - if (sim->ptypes[r&0xFF].properties & (TYPE_SOLID | TYPE_PART | TYPE_LIQUID) && !(sim->ptypes[r&0xFF].properties & PROP_SPARKSETTLE)) { + if ((sim->ptypes[r&0xFF].properties & (TYPE_SOLID | TYPE_PART | TYPE_LIQUID)) && !(sim->ptypes[r&0xFF].properties & PROP_SPARKSETTLE)) { sim->kill_part(i); return 1; } diff --git a/src/elements/newgraphics.cpp b/src/elements/newgraphics.cpp index 036a6a7..efdf128 100644 --- a/src/elements/newgraphics.cpp +++ b/src/elements/newgraphics.cpp @@ -357,7 +357,7 @@ int graphics_GLOW(GRAPHICS_FUNC_ARGS) } int graphics_LCRY(GRAPHICS_FUNC_ARGS) { - if(ren->decorations_enable && cpart->dcolour && cpart->dcolour&0xFF000000) + if(ren->decorations_enable && cpart->dcolour && (cpart->dcolour&0xFF000000)) { *colr = (cpart->dcolour>>16)&0xFF; *colg = (cpart->dcolour>>8)&0xFF; diff --git a/src/elements/stkm.cpp b/src/elements/stkm.cpp index c457b62..68ef1ed 100644 --- a/src/elements/stkm.cpp +++ b/src/elements/stkm.cpp @@ -78,6 +78,7 @@ int run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) { gvx = ((float)(parts[i].x - XCNTR) / gravd); gvy = ((float)(parts[i].y - YCNTR) / gravd); } + break; } gvx += sim->gravx[((int)parts[i].y/CELL)*(XRES/CELL)+((int)parts[i].x/CELL)]; diff --git a/src/elements/wire.cpp b/src/elements/wire.cpp index f7202e4..c3c918b 100644 --- a/src/elements/wire.cpp +++ b/src/elements/wire.cpp @@ -64,4 +64,5 @@ int graphics_WIRE(GRAPHICS_FUNC_ARGS) //*pixel_mode |= PMODE_GLOW; return 0; } + return 0; } |