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/lua_api/l_env.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/script/lua_api/l_env.h') diff --git a/src/script/lua_api/l_env.h b/src/script/lua_api/l_env.h index 4d295b6eb..6cfdc0f6d 100644 --- a/src/script/lua_api/l_env.h +++ b/src/script/lua_api/l_env.h @@ -188,15 +188,15 @@ class LuaABM : public ActiveBlockModifier { private: int m_id; - std::set m_trigger_contents; - std::set m_required_neighbors; + std::vector m_trigger_contents; + std::vector m_required_neighbors; float m_trigger_interval; u32 m_trigger_chance; bool m_simple_catch_up; public: LuaABM(lua_State *L, int id, - const std::set &trigger_contents, - const std::set &required_neighbors, + const std::vector &trigger_contents, + const std::vector &required_neighbors, float trigger_interval, u32 trigger_chance, bool simple_catch_up): m_id(id), m_trigger_contents(trigger_contents), @@ -206,11 +206,11 @@ public: m_simple_catch_up(simple_catch_up) { } - virtual const std::set &getTriggerContents() const + virtual const std::vector &getTriggerContents() const { return m_trigger_contents; } - virtual const std::set &getRequiredNeighbors() const + virtual const std::vector &getRequiredNeighbors() const { return m_required_neighbors; } -- cgit v1.2.3