From dd5c451e0349f57657010e3f89f3310412984ba9 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Tue, 10 Sep 2013 19:24:17 +0200 Subject: Allow non-string arguments for minetest.is_yes() --- src/script/lua_api/l_util.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/script/lua_api/l_util.cpp') diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp index 34788accd..af9c19210 100644 --- a/src/script/lua_api/l_util.cpp +++ b/src/script/lua_api/l_util.cpp @@ -220,11 +220,17 @@ int ModApiUtil::l_get_password_hash(lua_State *L) return 1; } -// is_yes(string) +// is_yes(arg) int ModApiUtil::l_is_yes(lua_State *L) { NO_MAP_LOCK_REQUIRED; - std::string str = luaL_checkstring(L, 1); + + lua_getglobal(L, "tostring"); // function to be called + lua_pushvalue(L, 1); // 1st argument + lua_call(L, 1, 1); // execute function + std::string str(lua_tostring(L, -1)); // get result + lua_pop(L, 1); + bool yes = is_yes(str); lua_pushboolean(L, yes); return 1; -- cgit v1.2.3