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

fix occasional crash when flood fill deleting

Browse Source
This commit is contained in:
jacob1 2013-07-29 00:34:43 -04:00
parent bd0b779bd0
commit 4746474127
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/simulation/Simulation.cpp
View File

@ -1419,7 +1419,7 @@ int Simulation::FloodParts(int x, int y, int fullc, int cm, int flags)
unsigned short (*coord_stack)[2]; unsigned short (*coord_stack)[2];
int coord_stack_size = 0; int coord_stack_size = 0;
int created_something = 0; int created_something = 0;
if (cm==-1) if (cm==-1)
{ {
//if initial flood point is out of bounds, do nothing //if initial flood point is out of bounds, do nothing
@ -1432,8 +1432,13 @@ int Simulation::FloodParts(int x, int y, int fullc, int cm, int flags)
cm = pmap[y][x]&0xFF; cm = pmap[y][x]&0xFF;
if (!cm) if (!cm)
cm = photons[y][x]&0xFF; cm = photons[y][x]&0xFF;
if (!cm && bmap[y/CELL][x/CELL]) if (!cm)
FloodWalls(x, y, WL_ERASE, -1); {
if (bmap[y/CELL][x/CELL])
return FloodWalls(x, y, WL_ERASE, -1);
else
return -1;
}
} }
else else
cm = 0; cm = 0;