From 813d819d153c78eb81893c208ba73c56237ea3d4 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Thu, 23 Nov 2017 23:35:52 +0100 Subject: [PATCH] Hint at problematic code when logging deprecated calls --- src/script/common/c_internal.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp index 0b388e383..3d766a955 100644 --- a/src/script/common/c_internal.cpp +++ b/src/script/common/c_internal.cpp @@ -150,9 +150,15 @@ void log_deprecated(lua_State *L, const std::string &message) } if (do_log) { - warningstream << message << std::endl; - // L can be NULL if we get called by log_deprecated(const std::string &msg) - // from scripting_game.cpp. + warningstream << message; + if (L) { // L can be NULL if we get called from scripting_game.cpp + lua_Debug ar; + FATAL_ERROR_IF(!lua_getstack(L, 2, &ar), "lua_getstack() failed"); + FATAL_ERROR_IF(!lua_getinfo(L, "Sl", &ar), "lua_getinfo() failed"); + warningstream << " (at " << ar.short_src << ":" << ar.currentline << ")"; + } + warningstream << std::endl; + if (L) { if (do_error) script_error(L, LUA_ERRRUN, NULL, NULL); -- 2.25.1