diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-05-16 23:59:28 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-05-16 23:59:28 +0300 |
| commit | 07ff1da6ae0728fa2f7bbf5d0e188e986344a0db (patch) | |
| tree | 1df887cd431b470112e14d2dd1265fb0d505dd48 /src/mapblockobject.cpp | |
| parent | 5624dac3b78e4c1113aaecf05da645f2ab55c98d (diff) | |
| parent | 29932d4bddad6a0ad4269606e38701d544784951 (diff) | |
| download | minetest-07ff1da6ae0728fa2f7bbf5d0e188e986344a0db.tar.gz minetest-07ff1da6ae0728fa2f7bbf5d0e188e986344a0db.tar.bz2 minetest-07ff1da6ae0728fa2f7bbf5d0e188e986344a0db.zip | |
merged CiaranG's stuff again: auto-admin powers to local user, DSTACK macro -Wformat warnings
Diffstat (limited to 'src/mapblockobject.cpp')
| -rw-r--r-- | src/mapblockobject.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mapblockobject.cpp b/src/mapblockobject.cpp index 343926f81..d05eee808 100644 --- a/src/mapblockobject.cpp +++ b/src/mapblockobject.cpp @@ -63,7 +63,7 @@ v3f MovingObject::getAbsoluteShowPos() void MovingObject::move(float dtime, v3f acceleration) { - DSTACK("%s: typeid=%i, pos=(%f,%f,%f), speed=(%f,%f,%f)" + DSTACKF("%s: typeid=%i, pos=(%f,%f,%f), speed=(%f,%f,%f)" ", dtime=%f, acc=(%f,%f,%f)", __FUNCTION_NAME, getTypeId(), @@ -755,7 +755,7 @@ void MapBlockObjectList::step(float dtime, bool server, u32 daynight_ratio) core::map<s16, bool> ids_to_delete; { - DSTACK("%s: stepping objects", __FUNCTION_NAME); + DSTACKF("%s: stepping objects", __FUNCTION_NAME); for(core::map<s16, MapBlockObject*>::Iterator i = m_objects.getIterator(); @@ -763,7 +763,7 @@ void MapBlockObjectList::step(float dtime, bool server, u32 daynight_ratio) { MapBlockObject *obj = i.getNode()->getValue(); - DSTACK("%s: stepping object type %i", __FUNCTION_NAME, + DSTACKF("%s: stepping object type %i", __FUNCTION_NAME, obj->getTypeId()); if(server) @@ -791,7 +791,7 @@ void MapBlockObjectList::step(float dtime, bool server, u32 daynight_ratio) } { - DSTACK("%s: deleting objects", __FUNCTION_NAME); + DSTACKF("%s: deleting objects", __FUNCTION_NAME); // Delete objects in delete queue for(core::map<s16, bool>::Iterator @@ -815,7 +815,7 @@ void MapBlockObjectList::step(float dtime, bool server, u32 daynight_ratio) return; { - DSTACK("%s: object wrap loop", __FUNCTION_NAME); + DSTACKF("%s: object wrap loop", __FUNCTION_NAME); for(core::map<s16, MapBlockObject*>::Iterator i = m_objects.getIterator(); |