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 f53a2b7e8086d3a3cd4c4eaabd44c2970ec19167..fbf24e1b7e021c357750c2b9ffd7be469d8be6ec 100644 (file)
--- a/src/script/common/helper.cpp
+++ b/src/script/common/helper.cpp
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <cmath>
 #include <sstream>
 #include <irr_v2d.h>
+#include <irr_v3d.h>
 #include "c_types.h"
 #include "c_internal.h"
 
@@ -49,25 +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_toboolean(L, index) != 0;
+       return lua_tonumber(L, index);
 }
 
-template <> s16 LuaHelper::readParam(lua_State *L, int index)
+template <>
+int LuaHelper::readParam(lua_State *L, int index)
 {
-       return lua_tonumber(L, 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.");
@@ -75,7 +77,8 @@ template <> float LuaHelper::readParam(lua_State *L, int index)
        return (float)luaL_checknumber(L, index);
 }
 
-template <> v2s16 LuaHelper::readParam(lua_State *L, int index)
+template <>
+v2s16 LuaHelper::readParam(lua_State *L, int index)
 {
        v2s16 p;
        CHECK_POS_TAB(index);
@@ -90,7 +93,8 @@ template <> v2s16 LuaHelper::readParam(lua_State *L, int index)
        return p;
 }
 
-template <> v2f LuaHelper::readParam(lua_State *L, int index)
+template <>
+v2f LuaHelper::readParam(lua_State *L, int index)
 {
        v2f p;
        CHECK_POS_TAB(index);
@@ -105,24 +109,32 @@ template <> v2f LuaHelper::readParam(lua_State *L, int index)
        return p;
 }
 
-template <> std::string LuaHelper::readParam(lua_State *L, int index)
+template <>
+v3f LuaHelper::readParam(lua_State *L, int index)
 {
-       size_t length;
-       std::string result;
-       const char *str = luaL_checklstring(L, index, &length);
-       result.assign(str, length);
-       return result;
+       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;
 }