diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp index 41e01994..dca7b868 100644 --- a/src/logic/scripting/lua/libgui.cpp +++ b/src/logic/scripting/lua/libgui.cpp @@ -16,7 +16,6 @@ #include "../../../graphics/ui/elements/Panel.hpp" #include "../../../graphics/ui/elements/Menu.hpp" #include "../../../graphics/ui/elements/InventoryView.hpp" -#include "../../../window/Events.hpp" #include "../../../frontend/UiDocument.hpp" #include "../../../frontend/locale.hpp" #include "../../../util/stringutil.hpp" @@ -463,10 +462,6 @@ static int l_gui_getviewport(lua_State* L) { return lua::pushvec2_arr(L, scripting::engine->getGUI()->getContainer()->getSize()); } -static int l_gui_get_mouse_pos(lua_State* L) { - return lua::pushvec2_arr(L, Events::cursor); -} - const luaL_Reg guilib [] = { {"get_viewport", lua_wrap_errors}, {"getattr", lua_wrap_errors}, @@ -474,7 +469,6 @@ const luaL_Reg guilib [] = { {"get_env", lua_wrap_errors}, {"str", lua_wrap_errors}, {"reindex", lua_wrap_errors}, - {"get_mouse_pos", lua_wrap_errors}, {"get_locales_info", lua_wrap_errors}, {NULL, NULL} }; diff --git a/src/logic/scripting/lua/libinput.cpp b/src/logic/scripting/lua/libinput.cpp index f654dc47..1c021093 100644 --- a/src/logic/scripting/lua/libinput.cpp +++ b/src/logic/scripting/lua/libinput.cpp @@ -1,4 +1,5 @@ #include "api_lua.hpp" +#include "lua_util.hpp" #include "lua_commons.hpp" #include "LuaState.hpp" #include "../scripting.hpp" @@ -39,9 +40,14 @@ static int l_add_callback(lua_State* L) { return 0; } +static int l_get_mouse_pos(lua_State* L) { + return lua::pushvec2_arr(L, Events::cursor); +} + const luaL_Reg inputlib [] = { {"keycode", lua_wrap_errors}, {"add_callback", lua_wrap_errors}, + {"get_mouse_pos", lua_wrap_errors}, {NULL, NULL} };