From 5f4c5fb11803366521f44fd05a3a88418f28fbf4 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Wed, 28 Feb 2018 22:01:49 -0500 Subject: [PATCH] Fix &255 usage --- src/simulation/Simulation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 3c6fadb43..aa0a72398 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -4709,7 +4709,7 @@ killed: { if ((TYP(pmap[j][nx])!=t || bmap[j/CELL][nx/CELL]) && do_move(i, nx, ny, (float)nx, (float)j)) break; - if ((pmap[j][nx]&255)!=t || (bmap[j/CELL][nx/CELL] && bmap[j/CELL][nx/CELL]!=WL_STREAM)) + if (TYP(pmap[j][nx])!=t || (bmap[j/CELL][nx/CELL] && bmap[j/CELL][nx/CELL]!=WL_STREAM)) break; } else if (s==-1) {} // particle is out of bounds