matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TPT: Make RBDM/WATR explosion work again, by not killing fire created by WATR 32c9ff3099

Browse Source
This commit is contained in:
Simon Robertshaw 2012-04-17 16:36:27 +01:00
parent 065ca8b9f5
commit 69e7dadcdf
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/elements/cbnw.cpp
View File

@ -76,8 +76,9 @@ int update_CBNW(UPDATE_FUNC_ARGS) {
{ {
sim->part_change_type(i,x,y,PT_FIRE); sim->part_change_type(i,x,y,PT_FIRE);
parts[i].life = 4; 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); sim->kill_part(r>>8);
if(1>(rand()%150)){ if(1>(rand()%150)){
sim->kill_part(i); sim->kill_part(i);

3
src/elements/watr.cpp
View File

@ -18,8 +18,9 @@ int update_WATR(UPDATE_FUNC_ARGS) {
{ {
sim->part_change_type(i,x,y,PT_FIRE); sim->part_change_type(i,x,y,PT_FIRE);
parts[i].life = 4; 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); sim->kill_part(r>>8);
if(1>(rand()%150)){ if(1>(rand()%150)){
sim->kill_part(i); sim->kill_part(i);

1
src/elements/wtrv.cpp
View File

@ -13,6 +13,7 @@ int update_WTRV(UPDATE_FUNC_ARGS) {
{ {
sim->part_change_type(i,x,y,PT_FIRE); sim->part_change_type(i,x,y,PT_FIRE);
parts[i].life = 4; parts[i].life = 4;
parts[i].ctype = PT_WATR;
} }
} }
if(parts[i].temp>1273&&parts[i].ctype==PT_FIRE) if(parts[i].temp>1273&&parts[i].ctype==PT_FIRE)