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_inventory.cpp | |
| parent | 227c71eb76e019873b30e2d3893b68307d51d58f (diff) | |
| download | minetest-eef62c82a2e58700fc1216b0b8c03e421bc77995.tar.gz minetest-eef62c82a2e58700fc1216b0b8c03e421bc77995.tar.bz2 minetest-eef62c82a2e58700fc1216b0b8c03e421bc77995.zip | |
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_inventory.cpp')
| -rw-r--r-- | src/script/lua_api/l_inventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/lua_api/l_inventory.cpp b/src/script/lua_api/l_inventory.cpp index f3097582e..04fa3a196 100644 --- a/src/script/lua_api/l_inventory.cpp +++ b/src/script/lua_api/l_inventory.cpp @@ -336,7 +336,7 @@ int InvRef::l_contains_item(lua_State *L) InventoryList *list = getlist(L, ref, listname); bool match_meta = false; if (lua_isboolean(L, 4)) - match_meta = lua_toboolean(L, 4); + match_meta = readParam<bool>(L, 4); if (list) { lua_pushboolean(L, list->containsItem(item, match_meta)); } else { @@ -525,7 +525,7 @@ int ModApiInventory::l_create_detached_inventory_raw(lua_State *L) { NO_MAP_LOCK_REQUIRED; const char *name = luaL_checkstring(L, 1); - const char *player = lua_isstring(L, 2) ? lua_tostring(L, 2) : ""; + std::string player = readParam<std::string>(L, 2, ""); if (getServer(L)->createDetachedInventory(name, player) != NULL) { InventoryLocation loc; loc.setDetached(name); |