stop neut from dragging particles inside energy walls, fixes jacob#18

The-Powder-Toy · Jan 30, 2014 · 1266307 · 1266307
1 parent 250b522
commit 1266307
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
@@ -2345,6 +2345,8 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny)
 			if (s && !(elements[s&0xFF].Properties&PROP_NEUTPENETRATE))
 				return 1; // if the element currently underneath neutron isn't NEUTPENETRATE, don't move anything except the neutron
 			// if nothing is currently underneath neutron, only move target particle
+			if(bmap[y/CELL][x/CELL] == WL_ALLOWENERGY)
+				return 1; // do not drag target particle into an energy only wall
 			if (s)
 			{
 				pmap[ny][nx] = (s&~(0xFF))|parts[s>>8].type;