matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed FIRE, SMKE, and CO2 passing through the powder-only wall.

Browse Source
This commit is contained in:
Sourec 2015-06-11 14:29:59 -04:00
parent 090585abf6
commit 1494f8237c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/simulation/Simulation.cpp
View File

@ -1859,7 +1859,7 @@ bool Simulation::IsWallBlocking(int x, int y, int type)
return true; return true;
else if (wall == WL_ALLOWLIQUID && elements[type].Falldown!=2) else if (wall == WL_ALLOWLIQUID && elements[type].Falldown!=2)
return true; return true;
else if (wall == WL_ALLOWSOLID && elements[type].Falldown!=1) else if (wall == WL_ALLOWSOLID && (elements[type].Falldown!=1 || type == PT_CO2 || type == PT_FIRE || type == PT_SMKE))
return true; return true;
else if (wall == WL_ALLOWAIR || wall == WL_WALL || wall == WL_WALLELEC) else if (wall == WL_ALLOWAIR || wall == WL_WALL || wall == WL_WALLELEC)
return true; return true;
@ -2065,7 +2065,7 @@ int Simulation::eval_move(int pt, int nx, int ny, unsigned *rr)
return 0; return 0;
if (bmap[ny/CELL][nx/CELL]==WL_ALLOWLIQUID && elements[pt].Falldown!=2) if (bmap[ny/CELL][nx/CELL]==WL_ALLOWLIQUID && elements[pt].Falldown!=2)
return 0; return 0;
if (bmap[ny/CELL][nx/CELL]==WL_ALLOWSOLID && elements[pt].Falldown!=1) if (bmap[ny/CELL][nx/CELL]==WL_ALLOWSOLID && (elements[pt].Falldown!=1 || pt == PT_FIRE || pt == PT_SMKE || pt || PT_CO2))
return 0; return 0;
if (bmap[ny/CELL][nx/CELL]==WL_ALLOWAIR || bmap[ny/CELL][nx/CELL]==WL_WALL || bmap[ny/CELL][nx/CELL]==WL_WALLELEC) if (bmap[ny/CELL][nx/CELL]==WL_ALLOWAIR || bmap[ny/CELL][nx/CELL]==WL_WALL || bmap[ny/CELL][nx/CELL]==WL_WALLELEC)
return 0; return 0;