diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-02-23 02:49:57 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-02-23 02:49:57 +0200 |
| commit | 9778347c7f118f6b74153f1d2c8070920352eb68 (patch) | |
| tree | 6be9dccbc2882645aa5430281b1a7e34cbcc2717 /src/mapblockobject.cpp | |
| parent | eef7bc35705611e3060fe1e6b7c2f8bbebb2ba8b (diff) | |
| download | minetest-9778347c7f118f6b74153f1d2c8070920352eb68.tar.gz minetest-9778347c7f118f6b74153f1d2c8070920352eb68.tar.bz2 minetest-9778347c7f118f6b74153f1d2c8070920352eb68.zip | |
mainly work on object scripting api
Diffstat (limited to 'src/mapblockobject.cpp')
| -rw-r--r-- | src/mapblockobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mapblockobject.cpp b/src/mapblockobject.cpp index ff58fd045..cd1618c3a 100644 --- a/src/mapblockobject.cpp +++ b/src/mapblockobject.cpp @@ -19,10 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapblockobject.h" #include "mapblock.h" -// Only for ::getNodeBox, TODO: Get rid of this +// For object wrapping #include "map.h" #include "inventory.h" #include "irrlichtwrapper.h" +#include "utility.h" /* MapBlockObject @@ -168,8 +169,7 @@ void MovingObject::move(float dtime, v3f acceleration) // walking over map borders } - core::aabbox3d<f32> nodebox = Map::getNodeBox( - v3s16(x,y,z)); + core::aabbox3d<f32> nodebox = getNodeBox(v3s16(x,y,z), BS); // See if the object is touching ground if( |