summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/simulation/Simulation.cpp4
-rw-r--r--src/simulation/elements/COAL.cpp4
-rw-r--r--src/simulation/elements/WOOD.cpp4
3 files changed, 8 insertions, 4 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index c6dec35..0a24539 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -2191,6 +2191,8 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny)
e = eval_move(parts[i].type, nx, ny, &r);
if(parts[i].sld && r && parts[i].sld == parts[r>>8].sld)
return 1;
+ if(parts[i].sld && r && (elements[r&255].Properties & (TYPE_GAS | TYPE_ENERGY)))
+ return 2;
if(!e && r && parts[r>>8].sld) {
parts[r>>8].vx += parts[i].vx;
@@ -2910,6 +2912,8 @@ int Simulation::create_part(int p, int x, int y, int tv)
{
detach(i);
}
+ if(parts[p].sld)
+ unlink_solid(p);
i = p;
}
diff --git a/src/simulation/elements/COAL.cpp b/src/simulation/elements/COAL.cpp
index b2cc89c..5d2c176 100644
--- a/src/simulation/elements/COAL.cpp
+++ b/src/simulation/elements/COAL.cpp
@@ -12,9 +12,9 @@ Element_COAL::Element_COAL()
Advection = 0.0f;
AirDrag = 0.00f * CFDS;
AirLoss = 0.90f;
- Loss = 0.00f;
+ Loss = 0.98f;
Collision = 0.0f;
- Gravity = 0.0f;
+ Gravity = 0.2f;
Diffusion = 0.0f;
HotAir = 0.0f * CFDS;
Falldown = 0;
diff --git a/src/simulation/elements/WOOD.cpp b/src/simulation/elements/WOOD.cpp
index 4676790..0e00780 100644
--- a/src/simulation/elements/WOOD.cpp
+++ b/src/simulation/elements/WOOD.cpp
@@ -12,9 +12,9 @@ Element_WOOD::Element_WOOD()
Advection = 0.0f;
AirDrag = 0.00f * CFDS;
AirLoss = 0.90f;
- Loss = 0.00f;
+ Loss = 0.95f;
Collision = 0.0f;
- Gravity = 0.0f;
+ Gravity = 0.1f;
Diffusion = 0.00f;
HotAir = 0.000f * CFDS;
Falldown = 0;