From 4d3cccccb71233b7d4b88db73a402ca03838640d Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Thu, 2 Feb 2023 22:57:32 +0300 Subject: [PATCH] engine: remove key Meta --- src/engine/e_input_sdl2.inc | 2 -- src/engine/e_input_stub.inc | 4 ---- src/game/sdl/g_system.pas | 6 ++---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/engine/e_input_sdl2.inc b/src/engine/e_input_sdl2.inc index 7318ea9..9e9c7d8 100644 --- a/src/engine/e_input_sdl2.inc +++ b/src/engine/e_input_sdl2.inc @@ -340,8 +340,6 @@ begin e_KeyNames[IK_DOT] := '.'; e_KeyNames[IK_MINUS] := '-'; e_KeyNames[IK_EQUALS] := '='; - e_KeyNames[IK_RMETA] := 'RMETA'; - e_KeyNames[IK_LMETA] := 'LMETA'; e_KeyNames[IK_NONUSBACKSLASH] := 'NONUSBACKSLASH'; // joysticks diff --git a/src/engine/e_input_stub.inc b/src/engine/e_input_stub.inc index 3c208ef..496dde5 100644 --- a/src/engine/e_input_stub.inc +++ b/src/engine/e_input_stub.inc @@ -138,8 +138,6 @@ interface IK_Y = 106; IK_Z = 107; IK_MINUS = 108; - IK_RMETA = 109; - IK_LMETA = 110; IK_NONUSBACKSLASH = 111; // TODO: think of something better than this shit IK_LASTKEY = e_MaxKbdKeys-1; @@ -353,8 +351,6 @@ begin e_KeyNames[IK_DOT] := '.'; e_KeyNames[IK_MINUS] := '-'; e_KeyNames[IK_EQUALS] := '='; - e_KeyNames[IK_RMETA] := 'RMETA'; - e_KeyNames[IK_LMETA] := 'LMETA'; e_KeyNames[IK_NONUSBACKSLASH] := 'NONUSBACKSLASH'; // joysticks diff --git a/src/game/sdl/g_system.pas b/src/game/sdl/g_system.pas index fb6dd77..0dee147 100644 --- a/src/game/sdl/g_system.pas +++ b/src/game/sdl/g_system.pas @@ -528,8 +528,8 @@ implementation SDLK_LCTRL: x := IK_CTRL; SDLK_RCTRL: x := IK_RCTRL; SDLK_RALT: x := IK_RALT; - SDLK_LSUPER: x := IK_WIN; - SDLK_RSUPER: x := IK_RWIN; + SDLK_LSUPER, SDLK_LMETA: x := IK_WIN; + SDLK_RSUPER, SDLK_RMETA: x := IK_RWIN; SDLK_MENU: x := IK_MENU; SDLK_PRINT: x := IK_PRINTSCR; SDLK_SCROLLOCK: x := IK_SCROLLLOCK; @@ -571,8 +571,6 @@ implementation SDLK_PAUSE: x := IK_PAUSE; SDLK_A..SDLK_Z: x := IK_A + (key - SDLK_A); SDLK_MINUS: x := IK_MINUS; - SDLK_RMETA: x := IK_RMETA; - SDLK_LMETA: x := IK_LMETA; else x := IK_INVALID end; -- 2.29.2