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

Correct proportions of CO2 and WATR when GEL/SPNG is absorbing BUBW

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-28 12:40:18 +01:00
parent 91ec4d1125
commit 5ded005b0c
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/simulation/elements/GEL.cpp
View File

@ -82,10 +82,7 @@ int Element_GEL::update(UPDATE_FUNC_ARGS)
if (((r&0xFF)==PT_CBNW) && parts[i].tmp<100) if (((r&0xFF)==PT_CBNW) && parts[i].tmp<100)
{ {
parts[i].tmp++; parts[i].tmp++;
if (rand()%4) sim->part_change_type(r>>8, x+rx, y+ry, PT_CO2);
sim->kill_part(r>>8);
else
sim->part_change_type(r>>8, x+rx, y+ry, PT_CO2);
} }
if ((r&0xFF)==PT_SPNG && parts[i].tmp<100 && ((parts[r>>8].life+1)>parts[i].tmp)) if ((r&0xFF)==PT_SPNG && parts[i].tmp<100 && ((parts[r>>8].life+1)>parts[i].tmp))

5
src/simulation/elements/SPNG.cpp
View File

@ -75,10 +75,7 @@ int Element_SPNG::update(UPDATE_FUNC_ARGS)
if ((r&0xFF)==PT_CBNW&&33>=rand()/(RAND_MAX/100)+1) if ((r&0xFF)==PT_CBNW&&33>=rand()/(RAND_MAX/100)+1)
{ {
parts[i].life++; parts[i].life++;
if (rand()%4) sim->part_change_type(r>>8, x+rx, y+ry, PT_CO2);
sim->kill_part(r>>8);
else
sim->part_change_type(r>>8, x+rx, y+ry, PT_CO2);
} }
if ((r&0xFF)==PT_PSTE&&33>=rand()/(RAND_MAX/100)+1) if ((r&0xFF)==PT_PSTE&&33>=rand()/(RAND_MAX/100)+1)
{ {