Permalink
Browse files

Changed falldown values for FIRE, CO2, and SMKE to zero, reverted cha…

…nges to collision/placement logic
  • Loading branch information...
C7C8 committed Jun 11, 2015
1 parent bbe0c34 commit 4e8335b0708ec038733486c28b3f676fcf0b7e52
@@ -1859,7 +1859,7 @@ bool Simulation::IsWallBlocking(int x, int y, int type)
return true;
else if (wall == WL_ALLOWLIQUID && elements[type].Falldown!=2)
return true;
else if (wall == WL_ALLOWSOLID && (elements[type].Falldown!=1 || type == PT_CO2 || type == PT_FIRE || type == PT_SMKE))
else if (wall == WL_ALLOWSOLID && elements[type].Falldown!=1)
return true;
else if (wall == WL_ALLOWAIR || wall == WL_WALL || wall == WL_WALLELEC)
return true;
@@ -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)
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;
@@ -17,7 +17,7 @@ Element_CO2::Element_CO2()
Gravity = 0.1f;
Diffusion = 1.0f;
HotAir = 0.000f * CFDS;
Falldown = 1;
Falldown = 0;
Flammable = 0;
Explosive = 0;
@@ -17,7 +17,7 @@ Element_FIRE::Element_FIRE()
Gravity = -0.1f;
Diffusion = 0.00f;
HotAir = 0.001f * CFDS;
Falldown = 1;
Falldown = 0;
Flammable = 0;
Explosive = 0;
@@ -17,7 +17,7 @@ Element_SMKE::Element_SMKE()
Gravity = -0.1f;
Diffusion = 0.00f;
HotAir = 0.001f * CFDS;
Falldown = 1;
Falldown = 0;
Flammable = 0;
Explosive = 0;

0 comments on commit 4e8335b

Please sign in to comment.