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 | 7c1ea34baf1560cf8757e95f740e3277afdd2ba2 (patch) | |
| tree | de25d3deff5b252e154719c6d1abae944d32a749 /src/content_sao.cpp | |
| parent | 3d53cc2c1122741df2dd4506ca5e7e188824b5c3 (diff) | |
| parent | 909075da5c656e42ea6b8c98c9c8ceb11c01fcc1 (diff) | |
| download | minetest-7c1ea34baf1560cf8757e95f740e3277afdd2ba2.tar.gz minetest-7c1ea34baf1560cf8757e95f740e3277afdd2ba2.tar.bz2 minetest-7c1ea34baf1560cf8757e95f740e3277afdd2ba2.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; |