mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

Make binding names layout-independent (bug 7908)

Browse Source
This commit is contained in:
Andrei Kortunov 2024-03-29 11:46:04 +04:00
parent 359600db83
commit 3d83585c46
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -165,6 +165,7 @@
Bug #7898: Editor: Invalid reference scales are allowed
Bug #7899: Editor: Doors can't be unlocked
Bug #7901: Editor: Teleport-related fields shouldn't be editable if a ref does not teleport
Bug #7908: Key bindings names in the settings menu are layout-specific
Feature #2566: Handle NAM9 records for manual cell references
Feature #3537: Shader-based water ripples
Feature #5173: Support for NiFogProperty

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

@ -221,7 +221,7 @@ namespace MWLua
api["getControlSwitch"] = [input](std::string_view key) { return input->getControlSwitch(key); };
api["setControlSwitch"] = [input](std::string_view key, bool v) { input->toggleControlSwitch(key, v); };
api["getKeyName"] = [](SDL_Scancode code) { return SDL_GetKeyName(SDL_GetKeyFromScancode(code)); };
api["getKeyName"] = [](SDL_Scancode code) { return SDL_GetScancodeName(code); };
api["ACTION"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, MWInput::Actions>({
{ "GameMenu", MWInput::A_GameMenu },

6
extern/oics/ICSInputControlSystem.cpp vendored
View File

@ -802,11 +802,7 @@ namespace ICS
std::string InputControlSystem::scancodeToString(SDL_Scancode key)
{
SDL_Keycode code = SDL_GetKeyFromScancode(key);
if (code == SDLK_UNKNOWN)
return std::string(SDL_GetScancodeName(key));
else
return std::string(SDL_GetKeyName(code));
return std::string(SDL_GetScancodeName(key));
}
void InputControlSystem::adjustMouseRegion(Uint16 width, Uint16 height)