summaryrefslogtreecommitdiff
path: root/src/simulation
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-07-25 17:03:43 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-07-25 17:03:43 (GMT)
commit9edf65fb3fb6077a27095f7db2a3cbd2e4626025 (patch)
treea17f67baa5503845d4ffbb08cfed16aa83d475ed /src/simulation
parent38e2eec80853b3a4e30315ccba23c551859df7d4 (diff)
downloadpowder-9edf65fb3fb6077a27095f7db2a3cbd2e4626025.zip
powder-9edf65fb3fb6077a27095f7db2a3cbd2e4626025.tar.gz
TPT: FIRW: less advection, and don't go faster when multiple fire particle... 9988dc17aa
Diffstat (limited to 'src/simulation')
-rw-r--r--src/simulation/elements/FIRW.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/simulation/elements/FIRW.cpp b/src/simulation/elements/FIRW.cpp
index b9ec468..bc047df 100644
--- a/src/simulation/elements/FIRW.cpp
+++ b/src/simulation/elements/FIRW.cpp
@@ -13,11 +13,11 @@ Element_FIRW::Element_FIRW()
MenuSection = SC_EXPLOSIVE;
Enabled = 1;
- Advection = 0.4f;
- AirDrag = 0.02f * CFDS;
+ Advection = 0.2f;
+ AirDrag = 0.01f * CFDS;
AirLoss = 0.96f;
Loss = 0.95f;
- Collision = -0.5f;
+ Collision = -0.1f;
Gravity = 0.1f;
Diffusion = 0.00f;
HotAir = 0.000f * CFDS;
@@ -78,6 +78,7 @@ int Element_FIRW::update(UPDATE_FUNC_ARGS)
multiplier = (parts[i].life+20)*0.2f/sqrtf(gx*gx+gy*gy);
parts[i].vx -= gx*multiplier;
parts[i].vy -= gy*multiplier;
+ return 0;
}
}
}