mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-13 11:54:04 +02:00
Code Issues Projects Releases Wiki Activity

fix issue with molten STKM that could break the simulation and cause crashes

Browse Source
This commit is contained in:
jacob1
2017-09-28 23:12:16 -04:00
parent fffe1b0c40
commit 77b6f44c74
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/simulation/Simulation.cpp
View File

@@ -4002,6 +4002,11 @@ void Simulation::UpdateParticles(int start, int end)
} }
else else
part_change_type(i,x,y,t); part_change_type(i,x,y,t);
// part_change_type could refuse to change the type and kill the particle
// for example, changing type to STKM but one already exists
// we need to account for that to not cause simulation corruption issues
if (parts[i].type == PT_NONE)
goto killed;
if (t==PT_FIRE || t==PT_PLSM || t==PT_CFLM) if (t==PT_FIRE || t==PT_PLSM || t==PT_CFLM)
parts[i].life = rand()%50+120; parts[i].life = rand()%50+120;
@@ -4131,6 +4136,11 @@ void Simulation::UpdateParticles(int start, int end)
{ {
parts[i].life = 0; parts[i].life = 0;
part_change_type(i,x,y,t); part_change_type(i,x,y,t);
// part_change_type could refuse to change the type and kill the particle
// for example, changing type to STKM but one already exists
// we need to account for that to not cause simulation corruption issues
if (parts[i].type == PT_NONE)
goto killed;
if (t==PT_FIRE) if (t==PT_FIRE)
parts[i].life = rand()%50+120; parts[i].life = rand()%50+120;
if (t==PT_NONE) if (t==PT_NONE)