diff options
author | Loic Blot <loic.blot@unix-experience.fr> | 2018-05-14 07:42:20 +0200 |
---|---|---|
committer | SmallJoker <mk939@ymail.com> | 2018-06-03 17:32:00 +0200 |
commit | 695d02e6bda939f7b00af402273b39a8fd75a203 (patch) | |
tree | 30e075240af7397fd933852e20f812417bb93b45 /src/script/lua_api/l_object.cpp | |
parent | e2815d27f16f20c503c34b9a0ab4f917dcab639b (diff) | |
download | minetest-695d02e6bda939f7b00af402273b39a8fd75a203.tar.gz minetest-695d02e6bda939f7b00af402273b39a8fd75a203.tar.bz2 minetest-695d02e6bda939f7b00af402273b39a8fd75a203.zip |
More C++03 fixes
Diffstat (limited to 'src/script/lua_api/l_object.cpp')
-rw-r--r-- | src/script/lua_api/l_object.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp index 0195dc399..8905f2d0c 100644 --- a/src/script/lua_api/l_object.cpp +++ b/src/script/lua_api/l_object.cpp @@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "lua_api/l_item.h" #include "common/c_converter.h" #include "common/c_content.h" +#include "util/cpp11_container.h" #include "log.h" #include "tool.h" #include "serverobject.h" @@ -137,10 +138,11 @@ int ObjectRef::l_remove(lua_State *L) if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER) return 0; - const std::unordered_set<int> &child_ids = co->getAttachmentChildIds(); - for (int child_id : child_ids) { + const UNORDERED_SET<int> &child_ids = co->getAttachmentChildIds(); + for (UNORDERED_SET<int>::const_iterator it = child_ids.begin(); it != child_ids.end(); + ++it) { // Child can be NULL if it was deleted earlier - if (ServerActiveObject *child = env->getActiveObject(child_id)) + if (ServerActiveObject *child = env->getActiveObject(*it)) child->setAttachment(0, "", v3f(0, 0, 0), v3f(0, 0, 0)); } |