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

particles can't be drawn with the brush inside of walls they don't belong, fix flood fill delete issue

Browse Source
This commit is contained in:
jacob1 2013-07-13 14:17:21 -04:00
parent 01b2d55263
commit 0214fcb5ae
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/simulation/Simulation.cpp
View File

@ -1445,7 +1445,7 @@ int Simulation::FloodParts(int x, int y, int fullc, int cm, int flags)
else else
cm = 0; cm = 0;
} }
if (IsWallBlocking(x, y, c)) if (c != 0 && IsWallBlocking(x, y, c))
return 1; return 1;
if (!FloodFillPmapCheck(x, y, cm)) if (!FloodFillPmapCheck(x, y, cm))
@ -2736,6 +2736,8 @@ int Simulation::create_part(int p, int x, int y, int tv)
} }
return -1; return -1;
} }
else if (IsWallBlocking(x, y, t))
return -1;
if (photons[y][x] && (elements[t].Properties & TYPE_ENERGY)) if (photons[y][x] && (elements[t].Properties & TYPE_ENERGY))
return -1; return -1;
if (pfree == -1) if (pfree == -1)