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

fix another crash with invalid SOAP (soap was detached before SOAP update function ran)

Browse Source
This commit is contained in:
jacob1
2015-11-22 17:53:22 -05:00
parent 7a78b91f4f
commit 5be9773eca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/simulation/elements/SOAP.cpp
View File

@@ -50,13 +50,13 @@ Element_SOAP::Element_SOAP()
//#TPT-Directive ElementHeader Element_SOAP static void detach(Simulation * sim, int i) //#TPT-Directive ElementHeader Element_SOAP static void detach(Simulation * sim, int i)
void Element_SOAP::detach(Simulation * sim, int i) void Element_SOAP::detach(Simulation * sim, int i)
{ {
if ((sim->parts[i].ctype&2) == 2 && sim->parts[sim->parts[i].tmp].type == PT_SOAP) if ((sim->parts[i].ctype&2) == 2 && sim->parts[i].tmp >= 0 && sim->parts[i].tmp < NPART && sim->parts[sim->parts[i].tmp].type == PT_SOAP)
{ {
if ((sim->parts[sim->parts[i].tmp].ctype&4) == 4) if ((sim->parts[sim->parts[i].tmp].ctype&4) == 4)
sim->parts[sim->parts[i].tmp].ctype ^= 4; sim->parts[sim->parts[i].tmp].ctype ^= 4;
} }
if ((sim->parts[i].ctype&4) == 4 && sim->parts[sim->parts[i].tmp2].type == PT_SOAP) if ((sim->parts[i].ctype&4) == 4 && sim->parts[i].tmp2 >= 0 && sim->parts[i].tmp2 < NPART && sim->parts[sim->parts[i].tmp2].type == PT_SOAP)
{ {
if ((sim->parts[sim->parts[i].tmp2].ctype&2) == 2) if ((sim->parts[sim->parts[i].tmp2].ctype&2) == 2)
sim->parts[sim->parts[i].tmp2].ctype ^= 2; sim->parts[sim->parts[i].tmp2].ctype ^= 2;