diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-11-05 20:10:35 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-11-05 20:10:35 (GMT) |
| commit | 150a2e528ee41cb596b59c8a3c9ec62e9bf686fa (patch) | |
| tree | 4aa02da9f38c5f24acc5ac1176d4010ace8fc8dd /src/simulation/elements/BOMB.cpp | |
| parent | 8614a2d9638da8ee6982e2a8eadf95eaf5365aa6 (diff) | |
| parent | 7da144fbae1dac390ddf3bbcc69a990cf91398ac (diff) | |
| download | powder-150a2e528ee41cb596b59c8a3c9ec62e9bf686fa.zip powder-150a2e528ee41cb596b59c8a3c9ec62e9bf686fa.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/PowderToypp
Diffstat (limited to 'src/simulation/elements/BOMB.cpp')
| -rw-r--r-- | src/simulation/elements/BOMB.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simulation/elements/BOMB.cpp b/src/simulation/elements/BOMB.cpp index 8aaa722..0335e59 100644 --- a/src/simulation/elements/BOMB.cpp +++ b/src/simulation/elements/BOMB.cpp @@ -58,7 +58,7 @@ int Element_BOMB::update(UPDATE_FUNC_ARGS) r = pmap[y+ry][x+rx]; if (!r) continue; - if ((r&0xFF)!=PT_BOMB && (r&0xFF)!=PT_EMBR && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN && (r&0xFF)!=PT_BCLN) + if ((r&0xFF)!=PT_BOMB && (r&0xFF)!=PT_EMBR && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN && (r&0xFF)!=PT_BCLN && (r&0xFF)!=PT_VIBR) { int rad = 8; int nxi; @@ -67,7 +67,7 @@ int Element_BOMB::update(UPDATE_FUNC_ARGS) for (nxj=-rad; nxj<=rad; nxj++) for (nxi=-rad; nxi<=rad; nxi++) if ((pow((float)nxi,2))/(pow((float)rad,2))+(pow((float)nxj,2))/(pow((float)rad,2))<=1) - if ((pmap[y+nxj][x+nxi]&0xFF)!=PT_DMND && (pmap[y+nxj][x+nxi]&0xFF)!=PT_CLNE && (pmap[y+nxj][x+nxi]&0xFF)!=PT_PCLN && (pmap[y+nxj][x+nxi]&0xFF)!=PT_BCLN) + if ((pmap[y+nxj][x+nxi]&0xFF)!=PT_DMND && (pmap[y+nxj][x+nxi]&0xFF)!=PT_CLNE && (pmap[y+nxj][x+nxi]&0xFF)!=PT_PCLN && (pmap[y+nxj][x+nxi]&0xFF)!=PT_BCLN && (pmap[y+nxj][x+nxi]&0xFF)!=PT_VIBR) { sim->delete_part(x+nxi, y+nxj, 0); sim->pv[(y+nxj)/CELL][(x+nxi)/CELL] += 0.1f; |