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

fix another out of bounds crash relating to stasis wall

Browse Source
This commit is contained in:
jacob1 2018-04-28 11:45:16 -04:00
parent be57130c7a
commit 67132c9925
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simulation/Simulation.cpp
View File

@ -5040,6 +5040,7 @@ void Simulation::RecalcFreeParticles(bool do_life_dec)
t = parts[i].type; t = parts[i].type;
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);
bool inBounds = false;
if (x>=0 && y>=0 && x<XRES && y<YRES) if (x>=0 && y>=0 && x<XRES && y<YRES)
{ {
if (elements[t].Properties & TYPE_ENERGY) if (elements[t].Properties & TYPE_ENERGY)
@ -5054,6 +5055,7 @@ void Simulation::RecalcFreeParticles(bool do_life_dec)
if (t!=PT_THDR && t!=PT_EMBR && t!=PT_FIGH && t!=PT_PLSM) if (t!=PT_THDR && t!=PT_EMBR && t!=PT_FIGH && t!=PT_PLSM)
pmap_count[y][x]++; pmap_count[y][x]++;
} }
inBounds = true;
} }
lastPartUsed = i; lastPartUsed = i;
NUM_PARTS ++; NUM_PARTS ++;
@ -5071,7 +5073,7 @@ void Simulation::RecalcFreeParticles(bool do_life_dec)
elementCount[t]++; elementCount[t]++;
unsigned int elem_properties = elements[t].Properties; unsigned int elem_properties = elements[t].Properties;
if (parts[i].life>0 && (elem_properties&PROP_LIFE_DEC) && !(bmap[y/CELL][x/CELL] == WL_STASIS && emap[y/CELL][x/CELL]<8)) if (parts[i].life>0 && (elem_properties&PROP_LIFE_DEC) && !(inBounds && bmap[y/CELL][x/CELL] == WL_STASIS && emap[y/CELL][x/CELL]<8))
{ {
// automatically decrease life // automatically decrease life
parts[i].life--; parts[i].life--;
@ -5082,7 +5084,7 @@ void Simulation::RecalcFreeParticles(bool do_life_dec)
continue; continue;
} }
} }
else if (parts[i].life<=0 && (elem_properties&PROP_LIFE_KILL) && !(bmap[y/CELL][x/CELL] == WL_STASIS && emap[y/CELL][x/CELL]<8)) else if (parts[i].life<=0 && (elem_properties&PROP_LIFE_KILL) && !(inBounds && bmap[y/CELL][x/CELL] == WL_STASIS && emap[y/CELL][x/CELL]<8))
{ {
// kill if no life // kill if no life
kill_part(i); kill_part(i);