Modernize lua read (part 2 & 3): C++ templating assurance (#7410)

[oweals/minetest.git] / src / script / cpp_api / s_env.cpp

diff --git a/src/script/cpp_api/s_env.cpp b/src/script/cpp_api/s_env.cpp
index c9b65209650e3f2b6e7d606308036ced91b25436..f8cef98b7332f98763ef853e6a4e43bd54dfdc62 100644 (file)
--- a/src/script/cpp_api/s_env.cpp
+++ b/src/script/cpp_api/s_env.cpp
@@ -116,12 +116,12 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env)
                        while (lua_next(L, table)) {
                                // key at index -2 and value at index -1
                                luaL_checktype(L, -1, LUA_TSTRING);
-                               trigger_contents.emplace_back(lua_tostring(L, -1));
+                               trigger_contents.emplace_back(readParam<std::string>(L, -1));
                                // removes value, keeps key for next iteration
                                lua_pop(L, 1);
                        }
                } else if (lua_isstring(L, -1)) {
-                       trigger_contents.emplace_back(lua_tostring(L, -1));
+                       trigger_contents.emplace_back(readParam<std::string>(L, -1));
                }
                lua_pop(L, 1);
 
@@ -133,12 +133,12 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env)
                        while (lua_next(L, table)) {
                                // key at index -2 and value at index -1
                                luaL_checktype(L, -1, LUA_TSTRING);
-                               required_neighbors.emplace_back(lua_tostring(L, -1));
+                               required_neighbors.emplace_back(readParam<std::string>(L, -1));
                                // removes value, keeps key for next iteration
                                lua_pop(L, 1);
                        }
                } else if (lua_isstring(L, -1)) {
-                       required_neighbors.emplace_back(lua_tostring(L, -1));
+                       required_neighbors.emplace_back(readParam<std::string>(L, -1));
                }
                lua_pop(L, 1);
 
@@ -185,12 +185,12 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env)
                        while (lua_next(L, table)) {
                                // key at index -2 and value at index -1
                                luaL_checktype(L, -1, LUA_TSTRING);
-                               trigger_contents.insert(lua_tostring(L, -1));
+                               trigger_contents.insert(readParam<std::string>(L, -1));
                                // removes value, keeps key for next iteration
                                lua_pop(L, 1);
                        }
                } else if (lua_isstring(L, -1)) {
-                       trigger_contents.insert(lua_tostring(L, -1));
+                       trigger_contents.insert(readParam<std::string>(L, -1));
                }
                lua_pop(L, 1);