Game-Decompilation/TR2X
1
0
Fork 0
mirror of https://github.com/LostArtefacts/TR2X.git synced 2024-11-30 09:30:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

input: pull g_KeyNames

Browse Source
This commit is contained in:
Marcin Kurczewski 2024-09-09 23:21:41 +02:00
parent fc79d77d16
commit bc6482a414
No known key found for this signature in database
GPG Key ID: CC65E6FD28CAE42A
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/progress.txt
View File

@ -4685,7 +4685,7 @@ typedef enum {
0x0051A250 + int32_t g_LayoutPage;
0x0051A24C + int32_t g_KeySelector;
0x0051A248 + int32_t g_KeyCursor;
0x00466FA8 - const char *g_KeyNames[];
0x00466FA8 + const char *g_KeyNames[];
0x00464500 - const uint16_t g_Requester_BackgroundGour1[];
0x00464520 - const uint16_t g_Requester_BackgroundGour2[];
0x00464538 - const uint16_t g_Requester_MainGour1[];

41
src/game/input.c
View File

@ -5,6 +5,45 @@
#include "global/vars.h"
#include "specific/s_input.h"
#include <libtrx/log.h>
static const char *m_KeyNames[] = {
NULL, "ESC", "1", "2", "3", "4", "5", "6",
"7", "8", "9", "0", "-", "+", "BKSP", "TAB",
"Q", "W", "E", "R", "T", "Y", "U", "I",
"O", "P", "<", ">", "RET", "CTRL", "A", "S",
"D", "F", "G", "H", "J", "K", "L", ";",
"'", "`", "SHIFT", "#", "Z", "X", "C", "V",
"B", "N", "M", ",", ".", "/", "SHIFT", "PADx",
"ALT", "SPACE", "CAPS", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, "NMLK", NULL, "PAD7",
"PAD8", "PAD9", "PAD-", "PAD4", "PAD5", "PAD6", "PAD+", "PAD1",
"PAD2", "PAD3", "PAD0", "PAD.", NULL, NULL, "\\", NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, "ENTER", "CTRL", NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, "SHIFT", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, "PAD/", NULL, NULL,
"ALT", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, "HOME",
"UP", "PGUP", NULL, "LEFT", NULL, "RIGHT", NULL, "END",
"DOWN", "PGDN", "INS", "DEL", NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"JOY1", "JOY2", "JOY3", "JOY4", "JOY5", "JOY6", "JOY7", "JOY8",
"JOY9", "JOY10", "JOY11", "JOY12", "JOY13", "JOY14", "JOY15", "JOY16",
};
bool g_ConflictLayout[INPUT_ROLE_NUMBER_OF] = { false };
bool Input_Update(void)
@ -78,5 +117,5 @@ const char *Input_GetRoleName(const INPUT_ROLE role)
const char *Input_GetKeyName(const uint16_t key)
{
return g_KeyNames[key];
return m_KeyNames[key];
}

2
src/game/ui/controllers/controls.c
View File

@ -143,7 +143,7 @@ static bool UI_ControlsController_Listen(
if (!pressed
// clang-format off
|| g_KeyNames[pressed] == NULL
|| Input_GetKeyName(pressed) == NULL
|| pressed == DIK_RETURN
|| pressed == DIK_LEFT
|| pressed == DIK_RIGHT