diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-01-20 14:48:46 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-25 13:33:22 (GMT) |
| commit | 32c9ff30999eecad31c096c9f6a677a458e91c25 (patch) | |
| tree | 15575412f2ff77d304c47c95f35856a90f3b6918 /src | |
| parent | 748a528fe016a3a08f332612f61d3b77656f3fe3 (diff) | |
| download | powder-32c9ff30999eecad31c096c9f6a677a458e91c25.zip powder-32c9ff30999eecad31c096c9f6a677a458e91c25.tar.gz | |
Make RBDM/WATR explosion work again, by not killing fire created by WATR
Diffstat (limited to 'src')
| -rw-r--r-- | src/elements/cbnw.c | 3 | ||||
| -rw-r--r-- | src/elements/watr.c | 3 | ||||
| -rw-r--r-- | src/elements/wtrv.c | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/elements/cbnw.c b/src/elements/cbnw.c index 62655cf..95db27e 100644 --- a/src/elements/cbnw.c +++ b/src/elements/cbnw.c @@ -76,8 +76,9 @@ int update_CBNW(UPDATE_FUNC_ARGS) { { 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){ kill_part(r>>8); if(1>(rand()%150)){ kill_part(i); diff --git a/src/elements/watr.c b/src/elements/watr.c index ac8d8e3..58a01a2 100644 --- a/src/elements/watr.c +++ b/src/elements/watr.c @@ -18,8 +18,9 @@ int update_WATR(UPDATE_FUNC_ARGS) { { 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){ kill_part(r>>8); if(1>(rand()%150)){ kill_part(i); diff --git a/src/elements/wtrv.c b/src/elements/wtrv.c index 2e8ca3a..8532600 100644 --- a/src/elements/wtrv.c +++ b/src/elements/wtrv.c @@ -13,6 +13,7 @@ int update_WTRV(UPDATE_FUNC_ARGS) { { 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) |