diff options
| author | Kahrl <kahrl@gmx.net> | 2017-09-11 15:51:40 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2017-09-12 19:31:46 +0200 |
| commit | 17fd5fe9358615633a04d7a3941b444a8ce5f199 (patch) | |
| tree | fc2862413a9fb3b022ae773498ef7d6d5c588eac /src/script/cpp_api | |
| parent | 5b3fbf9cf75f9f637c666d34e2489fef0cc035d9 (diff) | |
| download | minetest-17fd5fe9358615633a04d7a3941b444a8ce5f199.tar.gz minetest-17fd5fe9358615633a04d7a3941b444a8ce5f199.tar.bz2 minetest-17fd5fe9358615633a04d7a3941b444a8ce5f199.zip | |
Make INodeDefManager::getIds return a vector, not a set
Diffstat (limited to 'src/script/cpp_api')
| -rw-r--r-- | src/script/cpp_api/s_env.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/script/cpp_api/s_env.cpp b/src/script/cpp_api/s_env.cpp index b1404bf22..517892b03 100644 --- a/src/script/cpp_api/s_env.cpp +++ b/src/script/cpp_api/s_env.cpp @@ -108,7 +108,7 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env) int id = lua_tonumber(L, -2); int current_abm = lua_gettop(L); - std::set<std::string> trigger_contents; + std::vector<std::string> trigger_contents; lua_getfield(L, current_abm, "nodenames"); if (lua_istable(L, -1)) { int table = lua_gettop(L); @@ -116,16 +116,16 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env) while (lua_next(L, table)) { // key at index -2 and value at index -1 luaL_checktype(L, -1, LUA_TSTRING); - trigger_contents.insert(lua_tostring(L, -1)); + trigger_contents.push_back(lua_tostring(L, -1)); // removes value, keeps key for next iteration lua_pop(L, 1); } } else if (lua_isstring(L, -1)) { - trigger_contents.insert(lua_tostring(L, -1)); + trigger_contents.push_back(lua_tostring(L, -1)); } lua_pop(L, 1); - std::set<std::string> required_neighbors; + std::vector<std::string> required_neighbors; lua_getfield(L, current_abm, "neighbors"); if (lua_istable(L, -1)) { int table = lua_gettop(L); @@ -133,12 +133,12 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env) while (lua_next(L, table)) { // key at index -2 and value at index -1 luaL_checktype(L, -1, LUA_TSTRING); - required_neighbors.insert(lua_tostring(L, -1)); + required_neighbors.push_back(lua_tostring(L, -1)); // removes value, keeps key for next iteration lua_pop(L, 1); } } else if (lua_isstring(L, -1)) { - required_neighbors.insert(lua_tostring(L, -1)); + required_neighbors.push_back(lua_tostring(L, -1)); } lua_pop(L, 1); |