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

fix crash when particles are out of bounds

Browse Source
This commit is contained in:
jacob1
2018-04-28 00:27:03 -04:00
parent 777cb967a5
commit be57130c7a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/simulation/Simulation.cpp
View File

@@ -3667,11 +3667,6 @@ void Simulation::UpdateParticles(int start, int end)
x = (int)(parts[i].x+0.5f); x = (int)(parts[i].x+0.5f);
y = (int)(parts[i].y+0.5f); y = (int)(parts[i].y+0.5f);
// Make sure that STASIS'd particles don't tick.
if (bmap[y/CELL][x/CELL] == WL_STASIS && emap[y/CELL][x/CELL]<8) {
continue;
}
//this kills any particle out of the screen, or in a wall where it isn't supposed to go //this kills any particle out of the screen, or in a wall where it isn't supposed to go
if (x<CELL || y<CELL || x>=XRES-CELL || y>=YRES-CELL || if (x<CELL || y<CELL || x>=XRES-CELL || y>=YRES-CELL ||
(bmap[y/CELL][x/CELL] && (bmap[y/CELL][x/CELL] &&
@@ -3689,6 +3684,12 @@ void Simulation::UpdateParticles(int start, int end)
kill_part(i); kill_part(i);
continue; continue;
} }
// Make sure that STASIS'd particles don't tick.
if (bmap[y/CELL][x/CELL] == WL_STASIS && emap[y/CELL][x/CELL]<8) {
continue;
}
if (bmap[y/CELL][x/CELL]==WL_DETECT && emap[y/CELL][x/CELL]<8) if (bmap[y/CELL][x/CELL]==WL_DETECT && emap[y/CELL][x/CELL]<8)
set_emap(x/CELL, y/CELL); set_emap(x/CELL, y/CELL);