From 17fd5fe9358615633a04d7a3941b444a8ce5f199 Mon Sep 17 00:00:00 2001 From: Kahrl Date: Mon, 11 Sep 2017 15:51:40 +0200 Subject: Make INodeDefManager::getIds return a vector, not a set --- src/script/cpp_api/s_env.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/script/cpp_api') 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 trigger_contents; + std::vector 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 required_neighbors; + std::vector 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); -- cgit v1.2.3