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

fix flood fill delete on normal particles also deleting photons

Browse Source
This commit is contained in:
jacob1
2015-11-30 14:20:37 -05:00
parent 998f5a4cad
commit 9cab6959b6
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/simulation/Simulation.cpp
View File

@@ -1650,7 +1650,23 @@ int Simulation::FloodParts(int x, int y, int fullc, int cm, int flags)
// fill span // fill span
for (x=x1; x<=x2; x++) for (x=x1; x<=x2; x++)
{ {
if (CreateParts(x, y, 0, 0, fullc, flags)) if (!fullc)
{
if (elements[cm].Properties&TYPE_ENERGY)
{
if (photons[y][x])
{
kill_part(photons[y][x]>>8);
created_something = 1;
}
}
else if (pmap[y][x])
{
kill_part(pmap[y][x]>>8);
created_something = 1;
}
}
else if (CreateParts(x, y, 0, 0, fullc, flags))
created_something = 1; created_something = 1;
} }