From eef62c82a2e58700fc1216b0b8c03e421bc77995 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Sat, 30 Jun 2018 17:11:38 +0200 Subject: Modernize lua read (part 2 & 3): C++ templating assurance (#7410) * Modernize lua read (part 2 & 3): C++ templating assurance Implement the boolean reader Implement the string reader Also remove unused & unimplemented script_error_handler Add a reader with default value --- src/script/lua_api/l_areastore.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/script/lua_api/l_areastore.cpp') diff --git a/src/script/lua_api/l_areastore.cpp b/src/script/lua_api/l_areastore.cpp index 1e30e704e..d53d74aa8 100644 --- a/src/script/lua_api/l_areastore.cpp +++ b/src/script/lua_api/l_areastore.cpp @@ -156,7 +156,7 @@ int LuaAreaStore::l_get_areas_in_area(lua_State *L) bool include_data = false; bool accept_overlap = false; if (lua_isboolean(L, 4)) { - accept_overlap = lua_toboolean(L, 4); + accept_overlap = readParam(L, 4); get_data_and_border_flags(L, 5, &include_borders, &include_data); } std::vector res; @@ -328,7 +328,7 @@ int LuaAreaStore::create_object(lua_State *L) NO_MAP_LOCK_REQUIRED; LuaAreaStore *o = (lua_isstring(L, 1)) ? - new LuaAreaStore(lua_tostring(L, 1)) : + new LuaAreaStore(readParam(L, 1)) : new LuaAreaStore(); *(void **)(lua_newuserdata(L, sizeof(void *))) = o; -- cgit v1.2.3