Permalink
Browse files

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

…crashes
  • Loading branch information...
jacob1 committed Sep 29, 2017
1 parent fffe1b0 commit 77b6f44c74ec3327319d07803412a0ba0de7df8b
Showing with 10 additions and 0 deletions.
  1. +10 −0 src/simulation/Simulation.cpp
@@ -4002,6 +4002,11 @@ void Simulation::UpdateParticles(int start, int end)
}
else
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)
parts[i].life = rand()%50+120;
@@ -4131,6 +4136,11 @@ void Simulation::UpdateParticles(int start, int end)
{
parts[i].life = 0;
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)
parts[i].life = rand()%50+120;
if (t==PT_NONE)

0 comments on commit 77b6f44

Please sign in to comment.