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_craft.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_craft.cpp')
| -rw-r--r-- | src/script/lua_api/l_craft.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/script/lua_api/l_craft.cpp b/src/script/lua_api/l_craft.cpp index 7bf1d314b..64177109e 100644 --- a/src/script/lua_api/l_craft.cpp +++ b/src/script/lua_api/l_craft.cpp @@ -57,7 +57,7 @@ bool ModApiCraft::readCraftRecipeShaped(lua_State *L, int index, // key at index -2 and value at index -1 if(!lua_isstring(L, -1)) return false; - recipe.emplace_back(lua_tostring(L, -1)); + recipe.emplace_back(readParam<std::string>(L, -1)); // removes value, keeps key for next iteration lua_pop(L, 1); colcount++; @@ -90,7 +90,7 @@ bool ModApiCraft::readCraftRecipeShapeless(lua_State *L, int index, // key at index -2 and value at index -1 if(!lua_isstring(L, -1)) return false; - recipe.emplace_back(lua_tostring(L, -1)); + recipe.emplace_back(readParam<std::string>(L, -1)); // removes value, keeps key for next iteration lua_pop(L, 1); } @@ -115,12 +115,12 @@ bool ModApiCraft::readCraftReplacements(lua_State *L, int index, lua_rawgeti(L, -1, 1); if(!lua_isstring(L, -1)) return false; - std::string replace_from = lua_tostring(L, -1); + std::string replace_from = readParam<std::string>(L, -1); lua_pop(L, 1); lua_rawgeti(L, -1, 2); if(!lua_isstring(L, -1)) return false; - std::string replace_to = lua_tostring(L, -1); + std::string replace_to = readParam<std::string>(L, -1); lua_pop(L, 1); replacements.pairs.emplace_back(replace_from, replace_to); // removes value, keeps key for next iteration |