diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2018-06-30 17:11:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-30 17:11:38 +0200 |
commit | eef62c82a2e58700fc1216b0b8c03e421bc77995 (patch) | |
tree | 4c49e659069036cb53d69535dc33d33f29d963f4 /src/script/lua_api/l_areastore.cpp | |
parent | 227c71eb76e019873b30e2d3893b68307d51d58f (diff) | |
download | dragonfireclient-eef62c82a2e58700fc1216b0b8c03e421bc77995.tar.xz |
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
Diffstat (limited to 'src/script/lua_api/l_areastore.cpp')
-rw-r--r-- | src/script/lua_api/l_areastore.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<bool>(L, 4); get_data_and_border_flags(L, 5, &include_borders, &include_data); } std::vector<Area *> 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<std::string>(L, 1)) : new LuaAreaStore(); *(void **)(lua_newuserdata(L, sizeof(void *))) = o; |