Switched an OR to an AND

That was leftover from when I was rewriting a bit of this. Sorry!
The-Powder-Toy · Jun 11, 2015 · bbe0c34 · bbe0c34
1 parent 1494f82
commit bbe0c34
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
@@ -2065,7 +2065,7 @@ int Simulation::eval_move(int pt, int nx, int ny, unsigned *rr)
 			return 0;
 		if (bmap[ny/CELL][nx/CELL]==WL_ALLOWLIQUID && elements[pt].Falldown!=2)
 			return 0;
-		if (bmap[ny/CELL][nx/CELL]==WL_ALLOWSOLID && (elements[pt].Falldown!=1 || pt == PT_FIRE || pt == PT_SMKE || pt || PT_CO2))
+		if (bmap[ny/CELL][nx/CELL]==WL_ALLOWSOLID && (elements[pt].Falldown!=1 || pt == PT_FIRE || pt == PT_SMKE || pt == PT_CO2))
 			return 0;
 		if (bmap[ny/CELL][nx/CELL]==WL_ALLOWAIR || bmap[ny/CELL][nx/CELL]==WL_WALL || bmap[ny/CELL][nx/CELL]==WL_WALLELEC)
 			return 0;