diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-17 15:36:27 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-17 15:36:27 (GMT) |
| commit | 69e7dadcdf5daaddd663e67c54cc8dbd4a62eb0f (patch) | |
| tree | 091631b5ec5ca99d1c2ae66ade1568ccb477cfcb /src | |
| parent | 065ca8b9f53d861f4ddf474b049f2501ce0586e3 (diff) | |
| download | powder-69e7dadcdf5daaddd663e67c54cc8dbd4a62eb0f.zip powder-69e7dadcdf5daaddd663e67c54cc8dbd4a62eb0f.tar.gz | |
TPT: Make RBDM/WATR explosion work again, by not killing fire created by WATR 32c9ff3099
Diffstat (limited to 'src')
| -rw-r--r-- | src/elements/cbnw.cpp | 3 | ||||
| -rw-r--r-- | src/elements/watr.cpp | 3 | ||||
| -rw-r--r-- | src/elements/wtrv.cpp | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/elements/cbnw.cpp b/src/elements/cbnw.cpp index 37625b0..b480ed5 100644 --- a/src/elements/cbnw.cpp +++ b/src/elements/cbnw.cpp @@ -76,8 +76,9 @@ int update_CBNW(UPDATE_FUNC_ARGS) { { sim->part_change_type(i,x,y,PT_FIRE); parts[i].life = 4; + parts[i].ctype = PT_WATR; } - if ((r&0xFF)==PT_FIRE){ + if ((r&0xFF)==PT_FIRE && parts[r>>8].ctype!=PT_WATR){ sim->kill_part(r>>8); if(1>(rand()%150)){ sim->kill_part(i); diff --git a/src/elements/watr.cpp b/src/elements/watr.cpp index 9451a82..f6a9933 100644 --- a/src/elements/watr.cpp +++ b/src/elements/watr.cpp @@ -18,8 +18,9 @@ int update_WATR(UPDATE_FUNC_ARGS) { { sim->part_change_type(i,x,y,PT_FIRE); parts[i].life = 4; + parts[i].ctype = PT_WATR; } - if ((r&0xFF)==PT_FIRE){ + if ((r&0xFF)==PT_FIRE && parts[r>>8].ctype!=PT_WATR){ sim->kill_part(r>>8); if(1>(rand()%150)){ sim->kill_part(i); diff --git a/src/elements/wtrv.cpp b/src/elements/wtrv.cpp index 2e3838a..9c07e9f 100644 --- a/src/elements/wtrv.cpp +++ b/src/elements/wtrv.cpp @@ -13,6 +13,7 @@ int update_WTRV(UPDATE_FUNC_ARGS) { { sim->part_change_type(i,x,y,PT_FIRE); parts[i].life = 4; + parts[i].ctype = PT_WATR; } } if(parts[i].temp>1273&&parts[i].ctype==PT_FIRE) |