diff --git a/src/gui/lua/lua_cc_picture.cpp b/src/gui/lua/lua_cc_picture.cpp index f8de9070c..0e9c8bcbc 100644 --- a/src/gui/lua/lua_cc_picture.cpp +++ b/src/gui/lua/lua_cc_picture.cpp @@ -152,7 +152,7 @@ int CLuaInstCCPicture::CCPictureHide(lua_State *L) bool tmp1 = false; std::string tmp2 = "false"; if ((tableLookup(L, "no_restore", tmp1)) || (tableLookup(L, "no_restore", tmp2))) - printf("[%s:hide] Warning, obsolete parameter in use, please remove!\n", "cpicture"); + obsoleteHideParameter(L); if (D->parent) { D->cp->setPicture(""); diff --git a/src/gui/lua/lua_cc_text.cpp b/src/gui/lua/lua_cc_text.cpp index 4af40c59a..c71ab058a 100644 --- a/src/gui/lua/lua_cc_text.cpp +++ b/src/gui/lua/lua_cc_text.cpp @@ -177,7 +177,7 @@ int CLuaInstCCText::CCTextHide(lua_State *L) bool tmp1 = false; std::string tmp2 = "false"; if ((tableLookup(L, "no_restore", tmp1)) || (tableLookup(L, "no_restore", tmp2))) - printf("[%s:hide] Warning, obsolete parameter in use, please remove!\n", "ctext"); + obsoleteHideParameter(L); if (D->parent) { D->ct->setText("", D->mode, g_Font[D->font_text]); diff --git a/src/gui/lua/lua_cc_window.cpp b/src/gui/lua/lua_cc_window.cpp index 76c753bdb..7fe6617a2 100644 --- a/src/gui/lua/lua_cc_window.cpp +++ b/src/gui/lua/lua_cc_window.cpp @@ -200,7 +200,7 @@ int CLuaInstCCWindow::CCWindowHide(lua_State *L) bool tmp1 = false; std::string tmp2 = "false"; if ((tableLookup(L, "no_restore", tmp1)) || (tableLookup(L, "no_restore", tmp2))) - printf("[%s:hide] Warning, obsolete parameter in use, please remove!\n", "cwindow"); + obsoleteHideParameter(L); D->w->hide(); return 0; diff --git a/src/gui/lua/luainstance_helpers.cpp b/src/gui/lua/luainstance_helpers.cpp index 0be6b3a50..65defd65e 100644 --- a/src/gui/lua/luainstance_helpers.cpp +++ b/src/gui/lua/luainstance_helpers.cpp @@ -84,6 +84,14 @@ void functionDeprecated(lua_State *L, const char* oldFunc, const char* newFunc) ar.short_src, ar.currentline); } +void obsoleteHideParameter(lua_State *L) +{ + lua_Debug ar; + lua_getstack(L, 1, &ar); + lua_getinfo(L, "Sl", &ar); + printf("\33[1;31m[Lua script warning]\33[0m %s:%d: Obsolete parameter for hide() in use, please remove!\n", ar.short_src, ar.currentline); +} + lua_Unsigned checkMagicMask(lua_Unsigned col) { if ((col & MAGIC_MASK) == MAGIC_COLOR) diff --git a/src/gui/lua/luainstance_helpers.h b/src/gui/lua/luainstance_helpers.h index 6c636fd1d..bd4eb571f 100644 --- a/src/gui/lua/luainstance_helpers.h +++ b/src/gui/lua/luainstance_helpers.h @@ -85,6 +85,7 @@ bool _luaL_checkbool(lua_State *L, int numArg); void paramBoolDeprecated(lua_State *L, const char* val); void paramDeprecated(lua_State *L, const char* oldParam, const char* newParam); void functionDeprecated(lua_State *L, const char* oldFunc, const char* newFunc); +void obsoleteHideParameter(lua_State *L); lua_Unsigned checkMagicMask(lua_Unsigned col); bool tableLookup(lua_State*, const char*, std::string&);