diff options
author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2011-07-22 07:48:22 +0200 |
---|---|---|
committer | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2011-07-22 07:48:22 +0200 |
commit | 02653573d27efa13d8590504a8d30866fe5b093e (patch) | |
tree | 0894fb522ed13d77e6b104183fb6f3a62b6d9741 /src/content_sao.cpp | |
parent | 5c66664aef852c01c8ec8f79856ba081cf01446b (diff) | |
parent | 21b7a272c4558795f5e8b7d8af859d51dd616d31 (diff) | |
download | hax-minetest-server-02653573d27efa13d8590504a8d30866fe5b093e.tar.gz hax-minetest-server-02653573d27efa13d8590504a8d30866fe5b093e.zip |
Merge remote-tracking branch 'erlehmann/master'
Conflicts (from the introduction of fr translations):
src/CMakeLists.txt
Diffstat (limited to 'src/content_sao.cpp')
-rw-r--r-- | src/content_sao.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp index aeeafc2f8..0b81855c1 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -809,7 +809,7 @@ void FireflySAO::step(float dtime, bool send_recommended) Move it, with collision detection */ - core::aabbox3d<f32> box(-BS/3.,0.0,-BS/3., BS/3.,BS*2./3.,BS/3.); + core::aabbox3d<f32> box(-BS/3.,-BS*2/3.0,-BS/3., BS/3.,BS*4./3.,BS/3.); collisionMoveResult moveresult; // Maximum movement without glitches f32 pos_max_d = BS*0.25; |