diff options
| author | sapier <Sapier at GMX dot net> | 2013-01-12 17:59:19 +0000 |
|---|---|---|
| committer | PilzAdam <pilzadam@minetest.net> | 2013-03-28 00:09:24 +0100 |
| commit | 8800896824d609c754eee38d3720a112f4216e57 (patch) | |
| tree | 31e0be737fa3883acb1559ab5e6ada7e35ba20fb /src/particles.cpp | |
| parent | 880d9e53c39af1a7ca8b9ee5a9146708dabd5315 (diff) | |
| download | minetest-8800896824d609c754eee38d3720a112f4216e57.tar.gz minetest-8800896824d609c754eee38d3720a112f4216e57.tar.bz2 minetest-8800896824d609c754eee38d3720a112f4216e57.zip | |
Closed add object <-> object collision handling
Diffstat (limited to 'src/particles.cpp')
| -rw-r--r-- | src/particles.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/particles.cpp b/src/particles.cpp index 0445d7726..1d814f619 100644 --- a/src/particles.cpp +++ b/src/particles.cpp @@ -138,7 +138,7 @@ void Particle::step(float dtime, ClientEnvironment &env) v3f p_pos = m_pos*BS; v3f p_velocity = m_velocity*BS; v3f p_acceleration = m_acceleration*BS; - collisionMoveSimple(&env.getClientMap(), m_gamedef, + collisionMoveSimple(&env, m_gamedef, BS*0.5, box, 0, dtime, p_pos, p_velocity, p_acceleration); |