From bfc19d1fd7d7b283a285c318effe990856a6ca16 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Fri, 18 Dec 2015 00:56:42 -0500 Subject: [PATCH] revert pull request #258 (e308dd73bb56) Causes some issues with particle movement which was breaking some saves, and the previous commit still fixes these elements to move through gas wall instead of powder wall --- src/simulation/elements/CO2.cpp | 2 +- src/simulation/elements/FIRE.cpp | 2 +- src/simulation/elements/SMKE.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/simulation/elements/CO2.cpp b/src/simulation/elements/CO2.cpp index 08c38f2d8..bafebb014 100644 --- a/src/simulation/elements/CO2.cpp +++ b/src/simulation/elements/CO2.cpp @@ -17,7 +17,7 @@ Element_CO2::Element_CO2() Gravity = 0.1f; Diffusion = 1.0f; HotAir = 0.000f * CFDS; - Falldown = 0; + Falldown = 1; Flammable = 0; Explosive = 0; diff --git a/src/simulation/elements/FIRE.cpp b/src/simulation/elements/FIRE.cpp index f72f0a3a4..5543e0410 100644 --- a/src/simulation/elements/FIRE.cpp +++ b/src/simulation/elements/FIRE.cpp @@ -17,7 +17,7 @@ Element_FIRE::Element_FIRE() Gravity = -0.1f; Diffusion = 0.00f; HotAir = 0.001f * CFDS; - Falldown = 0; + Falldown = 1; Flammable = 0; Explosive = 0; diff --git a/src/simulation/elements/SMKE.cpp b/src/simulation/elements/SMKE.cpp index 1643c96df..4a993a30a 100644 --- a/src/simulation/elements/SMKE.cpp +++ b/src/simulation/elements/SMKE.cpp @@ -17,7 +17,7 @@ Element_SMKE::Element_SMKE() Gravity = -0.1f; Diffusion = 0.00f; HotAir = 0.001f * CFDS; - Falldown = 0; + Falldown = 1; Flammable = 0; Explosive = 0;