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/cpp_api/s_security.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/cpp_api/s_security.cpp')
-rw-r--r-- | src/script/cpp_api/s_security.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp index 6c50218d3..e87f16ddd 100644 --- a/src/script/cpp_api/s_security.cpp +++ b/src/script/cpp_api/s_security.cpp @@ -524,7 +524,7 @@ bool ScriptApiSecurity::checkPath(lua_State *L, const char *path, // Get mod name lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME); if (lua_isstring(L, -1)) { - std::string mod_name = lua_tostring(L, -1); + std::string mod_name = readParam<std::string>(L, -1); // Builtin can access anything if (mod_name == BUILTIN_MOD_NAME) { @@ -649,7 +649,7 @@ int ScriptApiSecurity::sl_g_loadfile(lua_State *L) lua_pop(L, 1); if (script->getType() == ScriptingType::Client) { - std:: string display_path = lua_tostring(L, 1); + std::string display_path = readParam<std::string>(L, 1); const std::string *path = script->getClient()->getModFile(display_path); if (!path) { std::string error_msg = "Coudln't find script called:" + display_path; |