fix particle #0 not being removed from the photons map when moving

The-Powder-Toy · Sep 9, 2018 · 7f215a6 · 7f215a6
1 parent 3707ecd
commit 7f215a6
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
@@ -2726,9 +2726,12 @@ int Simulation::do_move(int i, int x, int y, float nxf, float nyf)
 		parts[i].y = nyf;
 		if (ny!=y || nx!=x)
 		{
-			if (ID(pmap[y][x])==i) pmap[y][x] = 0;
-			else if (ID(photons[y][x])==i) photons[y][x] = 0;
-			if (nx<CELL || nx>=XRES-CELL || ny<CELL || ny>=YRES-CELL)//kill_part if particle is out of bounds
+			if (ID(pmap[y][x]) == i)
+				pmap[y][x] = 0;
+			if (ID(photons[y][x]) == i)
+				photons[y][x] = 0;
+			// kill_part if particle is out of bounds
+			if (nx < CELL || nx >= XRES - CELL || ny < CELL || ny >= YRES - CELL)
 			{
 				kill_part(i);
 				return -1;