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_entity.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_entity.cpp')
-rw-r--r-- | src/script/cpp_api/s_entity.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/cpp_api/s_entity.cpp b/src/script/cpp_api/s_entity.cpp index 88dbcc620..a3f7fa68b 100644 --- a/src/script/cpp_api/s_entity.cpp +++ b/src/script/cpp_api/s_entity.cpp @@ -257,7 +257,7 @@ bool ScriptApiEntity::luaentity_Punch(u16 id, setOriginFromTable(object); PCALL_RES(lua_pcall(L, 6, 1, error_handler)); - bool retval = lua_toboolean(L, -1); + bool retval = readParam<bool>(L, -1); lua_pop(L, 2); // Pop object and error handler return retval; } @@ -287,7 +287,7 @@ bool ScriptApiEntity::luaentity_run_simple_callback(u16 id, setOriginFromTable(object); PCALL_RES(lua_pcall(L, 2, 1, error_handler)); - bool retval = lua_toboolean(L, -1); + bool retval = readParam<bool>(L, -1); lua_pop(L, 2); // Pop object and error handler return retval; } |