Permalink
Browse files

Switched an OR to an AND

That was leftover from when I was rewriting a bit of this. Sorry!
  • Loading branch information...
C7C8 committed Jun 11, 2015
1 parent 1494f82 commit bbe0c34d3e548e3c7c3c715e83236711ae174e18
Showing with 1 addition and 1 deletion.
  1. +1 −1 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;

0 comments on commit bbe0c34

Please sign in to comment.