diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-11-04 20:35:43 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-11-04 20:35:43 (GMT) |
| commit | 12eb085d20dbb57cbbe79d92c9077dcc9de60330 (patch) | |
| tree | c927e2e3ebb5ce6f73e2fc3f571737bb132371e6 /src/simulation/elements/BOMB.cpp | |
| parent | d586a6d0abbc690ef6a0b9708a2343fe553adbc7 (diff) | |
| download | powder-12eb085d20dbb57cbbe79d92c9077dcc9de60330.zip powder-12eb085d20dbb57cbbe79d92c9077dcc9de60330.tar.gz | |
VIBR changes from jacob1
Including:
Molten TTAN + EXOT = VIBR.
VIBR + ANAR = BVBR. (BOYL reaction removed)
All absorbed heat/particles/pressure are stored in one property, tmp.
Graphics changes
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; |