Merge branch 'master' of https://github.com/minetest/minetest

1 files changed, 19 insertions, 3 deletions

diff --git a/src/script/lua_api/l_env.h b/src/script/lua_api/l_env.h
index 29044c0e8..a5ac21e21 100644
--- a/src/script/lua_api/l_env.h
+++ b/src/script/lua_api/l_env.h
@@ -207,6 +207,9 @@ private:
 	// stops forceloading a position
 	static int l_forceload_free_block(lua_State *L);
 
+	// compare_block_status(nodepos)
+	static int l_compare_block_status(lua_State *L);
+
 	// Get a string translated server side
 	static int l_get_translated_string(lua_State * L);
 
@@ -219,7 +222,8 @@ public:
 	static void Initialize(lua_State *L, int top);
 	static void InitializeClient(lua_State *L, int top);
 
-	static struct EnumString es_ClearObjectsMode[];
+	static const EnumString es_ClearObjectsMode[];
+	static const EnumString es_BlockStatusType[];
 };
 
 class LuaABM : public ActiveBlockModifier {
@@ -231,17 +235,21 @@ private:
 	float m_trigger_interval;
 	u32 m_trigger_chance;
 	bool m_simple_catch_up;
+	s16 m_min_y;
+	s16 m_max_y;
 public:
 	LuaABM(lua_State *L, int id,
 			const std::vector<std::string> &trigger_contents,
 			const std::vector<std::string> &required_neighbors,
-			float trigger_interval, u32 trigger_chance, bool simple_catch_up):
+			float trigger_interval, u32 trigger_chance, bool simple_catch_up, s16 min_y, s16 max_y):
 		m_id(id),
 		m_trigger_contents(trigger_contents),
 		m_required_neighbors(required_neighbors),
 		m_trigger_interval(trigger_interval),
 		m_trigger_chance(trigger_chance),
-		m_simple_catch_up(simple_catch_up)
+		m_simple_catch_up(simple_catch_up),
+		m_min_y(min_y),
+		m_max_y(max_y)
 	{
 	}
 	virtual const std::vector<std::string> &getTriggerContents() const
@@ -264,6 +272,14 @@ public:
 	{
 		return m_simple_catch_up;
 	}
+	virtual s16 getMinY()
+	{
+		return m_min_y;
+	}
+	virtual s16 getMaxY()
+	{
+		return m_max_y;
+	}
 	virtual void trigger(ServerEnvironment *env, v3s16 p, MapNode n,
 			u32 active_object_count, u32 active_object_count_wider);
 };