mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 03:40:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'lua_input' into 'master'

Browse Source 
Fix compiler warnings in apps/openmw/mwlua/inputbindings.cpp

See merge request OpenMW/openmw!1403
This commit is contained in:
Evil Eye 2021-11-16 16:41:38 +00:00
commit 71f020c23b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/openmw/mwlua/inputbindings.cpp
View File

@ -37,7 +37,7 @@ namespace MWLua
api["isIdle"] = [input]() { return input->isIdle(); }; api["isIdle"] = [input]() { return input->isIdle(); };
api["isActionPressed"] = [input](int action) { return input->actionIsActive(action); }; api["isActionPressed"] = [input](int action) { return input->actionIsActive(action); };
api["isKeyPressed"] = [input](SDL_Scancode code) -> bool api["isKeyPressed"] = [](SDL_Scancode code) -> bool
{ {
int maxCode; int maxCode;
const auto* state = SDL_GetKeyboardState(&maxCode); const auto* state = SDL_GetKeyboardState(&maxCode);
@ -46,10 +46,10 @@ namespace MWLua
else else
return false; return false;
}; };
api["isShiftPressed"] = [input]() -> bool { return SDL_GetModState() & KMOD_SHIFT; }; api["isShiftPressed"] = []() -> bool { return SDL_GetModState() & KMOD_SHIFT; };
api["isCtrlPressed"] = [input]() -> bool { return SDL_GetModState() & KMOD_CTRL; }; api["isCtrlPressed"] = []() -> bool { return SDL_GetModState() & KMOD_CTRL; };
api["isAltPressed"] = [input]() -> bool { return SDL_GetModState() & KMOD_ALT; }; api["isAltPressed"] = []() -> bool { return SDL_GetModState() & KMOD_ALT; };
api["isSuperPressed"] = [input]() -> bool { return SDL_GetModState() & KMOD_GUI; }; api["isSuperPressed"] = []() -> bool { return SDL_GetModState() & KMOD_GUI; };
api["isControllerButtonPressed"] = [input](int button) api["isControllerButtonPressed"] = [input](int button)
{ {
return input->isControllerButtonPressed(static_cast<SDL_GameControllerButton>(button)); return input->isControllerButtonPressed(static_cast<SDL_GameControllerButton>(button));