Add callback on_mapblocks_changed

[minetest.git] / src / script / common / c_converter.h

diff --git a/src/script/common/c_converter.h b/src/script/common/c_converter.h
index 7827d8146753987a008907c0802c88ea46ea2913..f1e4e47ec255b8e3ab48c7e7f622b2d0461a66a2 100644 (file)
--- a/src/script/common/c_converter.h
+++ b/src/script/common/c_converter.h
@@ -42,24 +42,34 @@ bool               getboolfield_default(lua_State *L, int table,
                              const char *fieldname, bool default_);
 float              getfloatfield_default(lua_State *L, int table,
                              const char *fieldname, float default_);
-int                getintfield_default           (lua_State *L, int table,
+int                getintfield_default(lua_State *L, int table,
                              const char *fieldname, int default_);
 
+bool check_field_or_nil(lua_State *L, int index, int type, const char *fieldname);
+
+template<typename T>
+bool getintfield(lua_State *L, int table,
+               const char *fieldname, T &result)
+{
+       lua_getfield(L, table, fieldname);
+       bool got = false;
+       if (check_field_or_nil(L, -1, LUA_TNUMBER, fieldname)){
+               result = lua_tointeger(L, -1);
+               got = true;
+       }
+       lua_pop(L, 1);
+       return got;
+}
+
+// Retrieve an v3s16 where all components are optional (falls back to default)
+v3s16              getv3s16field_default(lua_State *L, int table,
+                             const char *fieldname, v3s16 default_);
+
 bool               getstringfield(lua_State *L, int table,
                              const char *fieldname, std::string &result);
 size_t             getstringlistfield(lua_State *L, int table,
                              const char *fieldname,
                              std::vector<std::string> *result);
-bool               getintfield(lua_State *L, int table,
-                             const char *fieldname, int &result);
-bool               getintfield(lua_State *L, int table,
-                             const char *fieldname, u8 &result);
-bool               getintfield(lua_State *L, int table,
-                             const char *fieldname, s8 &result);
-bool               getintfield(lua_State *L, int table,
-                             const char *fieldname, u16 &result);
-bool               getintfield(lua_State *L, int table,
-                             const char *fieldname, u32 &result);
 void               read_groups(lua_State *L, int index,
                              std::unordered_map<std::string, int> &result);
 bool               getboolfield(lua_State *L, int table,
@@ -67,11 +77,8 @@ bool               getboolfield(lua_State *L, int table,
 bool               getfloatfield(lua_State *L, int table,
                              const char *fieldname, float &result);
 
-std::string        checkstringfield(lua_State *L, int table,
-                             const char *fieldname);
-
 void               setstringfield(lua_State *L, int table,
-                             const char *fieldname, const char *value);
+                             const char *fieldname, const std::string &value);
 void               setintfield(lua_State *L, int table,
                              const char *fieldname, int value);
 void               setfloatfield(lua_State *L, int table,
@@ -81,7 +88,6 @@ void               setboolfield(lua_State *L, int table,
 
 v3f                 checkFloatPos       (lua_State *L, int index);
 v2f                 check_v2f           (lua_State *L, int index);
-v2s16               check_v2s16         (lua_State *L, int index);
 v3f                 check_v3f           (lua_State *L, int index);
 v3s16               check_v3s16         (lua_State *L, int index);
 
@@ -92,6 +98,7 @@ v2s32               read_v2s32          (lua_State *L, int index);
 video::SColor       read_ARGB8          (lua_State *L, int index);
 bool                read_color          (lua_State *L, int index,
                                          video::SColor *color);
+bool                is_color_table      (lua_State *L, int index);
 
 aabb3f              read_aabb3f         (lua_State *L, int index, f32 scale);
 v3s16               read_v3s16          (lua_State *L, int index);
@@ -99,9 +106,6 @@ std::vector<aabb3f> read_aabb3f_vector  (lua_State *L, int index, f32 scale);
 size_t              read_stringlist     (lua_State *L, int index,
                                          std::vector<std::string> *result);
 
-void                push_float_string   (lua_State *L, float value);
-void                push_v3_float_string(lua_State *L, v3f p);
-void                push_v2_float_string(lua_State *L, v2f p);
 void                push_v2s16          (lua_State *L, v2s16 p);
 void                push_v2s32          (lua_State *L, v2s32 p);
 void                push_v3s16          (lua_State *L, v3s16 p);
@@ -117,5 +121,12 @@ void                warn_if_field_exists(lua_State *L, int table,
 
 size_t write_array_slice_float(lua_State *L, int table_index, float *data,
        v3u16 data_size, v3u16 slice_offset, v3u16 slice_size);
-size_t write_array_slice_u16(lua_State *L, int table_index, u16 *data,
-       v3u16 data_size, v3u16 slice_offset, v3u16 slice_size);
+
+// This must match the implementation in builtin/game/misc_s.lua
+// Note that this returns a floating point result as Lua integers are 32-bit
+inline lua_Number hash_node_position(v3s16 pos)
+{
+       return (((s64)pos.Z + 0x8000L) << 32)
+                       | (((s64)pos.Y + 0x8000L) << 16)
+                       | ((s64)pos.X + 0x8000L);
+}