luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 00:55:20 +02:00
Code Activity

Make INodeDefManager::getIds return a vector, not a set

Browse Source
This commit is contained in:
Kahrl
2017-09-11 15:51:40 +02:00
committed by sfan5
parent 5b3fbf9cf7
commit 17fd5fe935
7 changed files with 64 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/script/lua_api/l_env.h
View File

@@ -188,15 +188,15 @@ class LuaABM : public ActiveBlockModifier {
private:
int m_id;
std::set<std::string> m_trigger_contents;
std::set<std::string> m_required_neighbors;
std::vector<std::string> m_trigger_contents;
std::vector<std::string> 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<std::string> &trigger_contents,
const std::set<std::string> &required_neighbors,
const std::vector<std::string> &trigger_contents,
const std::vector<std::string> &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<std::string> &getTriggerContents() const
virtual const std::vector<std::string> &getTriggerContents() const
{
return m_trigger_contents;
}
virtual const std::set<std::string> &getRequiredNeighbors() const
virtual const std::vector<std::string> &getRequiredNeighbors() const
{
return m_required_neighbors;
}