Fix server favorites not saving when client/serverlist/ doesn't exist already (#11152)

[minetest.git] / src / script / common / helper.cpp

diff --git a/src/script/common/helper.cpp b/src/script/common/helper.cpp
index 9adc56a657adf6c1131498f4584d025f4e570875..fbf24e1b7e021c357750c2b9ffd7be469d8be6ec 100644 (file)
--- a/src/script/common/helper.cpp
+++ b/src/script/common/helper.cpp
@@ -20,7 +20,27 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "helper.h"
 #include <cmath>
 #include <sstream>
+#include <irr_v2d.h>
+#include <irr_v3d.h>
 #include "c_types.h"
+#include "c_internal.h"
+
+// imported from c_converter.cpp with pure C++ style
+static inline void check_lua_type(lua_State *L, int index, const char *name, int type)
+{
+       int t = lua_type(L, index);
+       if (t != type) {
+               std::string traceback = script_get_backtrace(L);
+               throw LuaError(std::string("Invalid ") + (name) + " (expected " +
+                               lua_typename(L, (type)) + " got " + lua_typename(L, t) +
+                               ").\n" + traceback);
+       }
+}
+
+// imported from c_converter.cpp
+#define CHECK_POS_COORD(name)                                                            \
+       check_lua_type(L, -1, "position coordinate '" name "'", LUA_TNUMBER)
+#define CHECK_POS_TAB(index) check_lua_type(L, index, "position", LUA_TTABLE)
 
 bool LuaHelper::isNaN(lua_State *L, int idx)
 {
@@ -30,20 +50,26 @@ bool LuaHelper::isNaN(lua_State *L, int idx)
 /*
  * Read template functions
  */
-template <> bool LuaHelper::readParam(lua_State *L, int index)
+template <>
+bool LuaHelper::readParam(lua_State *L, int index)
 {
        return lua_toboolean(L, index) != 0;
 }
 
-template <> bool LuaHelper::readParam(lua_State *L, int index, const bool &default_value)
+template <>
+s16 LuaHelper::readParam(lua_State *L, int index)
 {
-       if (lua_isnil(L, index))
-               return default_value;
+       return lua_tonumber(L, index);
+}
 
-       return lua_toboolean(L, index) != 0;
+template <>
+int LuaHelper::readParam(lua_State *L, int index)
+{
+       return luaL_checkint(L, index);
 }
 
-template <> float LuaHelper::readParam(lua_State *L, int index)
+template <>
+float LuaHelper::readParam(lua_State *L, int index)
 {
        if (isNaN(L, index))
                throw LuaError("NaN value is not allowed.");
@@ -51,23 +77,64 @@ template <> float LuaHelper::readParam(lua_State *L, int index)
        return (float)luaL_checknumber(L, index);
 }
 
-template <> std::string LuaHelper::readParam(lua_State *L, int index)
+template <>
+v2s16 LuaHelper::readParam(lua_State *L, int index)
 {
-       std::string result;
-       const char *str = luaL_checkstring(L, index);
-       result.append(str);
-       return result;
+       v2s16 p;
+       CHECK_POS_TAB(index);
+       lua_getfield(L, index, "x");
+       CHECK_POS_COORD("x");
+       p.X = readParam<s16>(L, -1);
+       lua_pop(L, 1);
+       lua_getfield(L, index, "y");
+       CHECK_POS_COORD("y");
+       p.Y = readParam<s16>(L, -1);
+       lua_pop(L, 1);
+       return p;
+}
+
+template <>
+v2f LuaHelper::readParam(lua_State *L, int index)
+{
+       v2f p;
+       CHECK_POS_TAB(index);
+       lua_getfield(L, index, "x");
+       CHECK_POS_COORD("x");
+       p.X = readParam<float>(L, -1);
+       lua_pop(L, 1);
+       lua_getfield(L, index, "y");
+       CHECK_POS_COORD("y");
+       p.Y = readParam<float>(L, -1);
+       lua_pop(L, 1);
+       return p;
+}
+
+template <>
+v3f LuaHelper::readParam(lua_State *L, int index)
+{
+       v3f p;
+       CHECK_POS_TAB(index);
+       lua_getfield(L, index, "x");
+       CHECK_POS_COORD("x");
+       p.X = readParam<float>(L, -1);
+       lua_pop(L, 1);
+       lua_getfield(L, index, "y");
+       CHECK_POS_COORD("y");
+       p.Y = readParam<float>(L, -1);
+       lua_pop(L, 1);
+       lua_getfield(L, index, "z");
+       CHECK_POS_COORD("z");
+       p.Z = readParam<float>(L, -1);
+       lua_pop(L, 1);
+       return p;
 }
 
 template <>
-std::string LuaHelper::readParam(
-               lua_State *L, int index, const std::string &default_value)
+std::string LuaHelper::readParam(lua_State *L, int index)
 {
+       size_t length;
        std::string result;
-       const char *str = lua_tostring(L, index);
-       if (str)
-               result.append(str);
-       else
-               result = default_value;
+       const char *str = luaL_checklstring(L, index, &length);
+       result.assign(str, length);
        return result;
 }