From 61bc3c019b4ef2c872bdd424b7e342e289f5e159 Mon Sep 17 00:00:00 2001 From: Chugunov Roman Date: Thu, 23 Nov 2023 20:47:46 +0300 Subject: [PATCH 1/2] xrGame/key_binding_registrator_script.cpp: add keys and actions for PDA tab (CoC) --- src/xrEngine/key_binding_registrator_script.cpp | 7 +++++++ src/xrEngine/xr_level_controller.cpp | 7 +++++++ src/xrEngine/xr_level_controller.h | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/src/xrEngine/key_binding_registrator_script.cpp b/src/xrEngine/key_binding_registrator_script.cpp index 7291cfdb9ff..fa04ac58c2d 100644 --- a/src/xrEngine/key_binding_registrator_script.cpp +++ b/src/xrEngine/key_binding_registrator_script.cpp @@ -146,6 +146,13 @@ SCRIPT_EXPORT(KeyBindings, (), value("kCUSTOM14", int(kCUSTOM14)), value("kCUSTOM15", int(kCUSTOM15)), + value("kPDA_TAB1", int(kPDA_TAB1)), + value("kPDA_TAB2", int(kPDA_TAB2)), + value("kPDA_TAB3", int(kPDA_TAB3)), + value("kPDA_TAB4", int(kPDA_TAB4)), + value("kPDA_TAB5", int(kPDA_TAB5)), + value("kPDA_TAB6", int(kPDA_TAB6)), + value("kKICK", int(kKICK)), value("kEDITOR", int(kEDITOR)), diff --git a/src/xrEngine/xr_level_controller.cpp b/src/xrEngine/xr_level_controller.cpp index 7185aab3245..8ea6d38d23e 100644 --- a/src/xrEngine/xr_level_controller.cpp +++ b/src/xrEngine/xr_level_controller.cpp @@ -143,6 +143,13 @@ game_action actions[] = { "custom14", kCUSTOM14, _sp }, { "custom15", kCUSTOM15, _sp }, + { "pda_tab1", kPDA_TAB1, _sp }, + { "pda_tab2", kPDA_TAB2, _sp }, + { "pda_tab3", kPDA_TAB3, _sp }, + { "pda_tab4", kPDA_TAB4, _sp }, + { "pda_tab5", kPDA_TAB5, _sp }, + { "pda_tab6", kPDA_TAB6, _sp }, + { "kick", kKICK, _sp }, { "editor", kEDITOR, _both }, diff --git a/src/xrEngine/xr_level_controller.h b/src/xrEngine/xr_level_controller.h index d0f291682b6..5d38037391e 100644 --- a/src/xrEngine/xr_level_controller.h +++ b/src/xrEngine/xr_level_controller.h @@ -124,6 +124,13 @@ enum EGameActions : u32 kCUSTOM14, kCUSTOM15, + kPDA_TAB1, + kPDA_TAB2, + kPDA_TAB3, + kPDA_TAB4, + kPDA_TAB5, + kPDA_TAB6, + kKICK, // alpet: kick dynamic objects kEDITOR, From a03a7f8dac3e2034cce7ab5c85b7ff537ca1f4fd Mon Sep 17 00:00:00 2001 From: Chugunov Roman Date: Wed, 29 Nov 2023 21:05:34 +0300 Subject: [PATCH 2/2] xrGame/key_binding_registrator_script.cpp: add numpad keys --- src/xrEngine/key_binding_registrator_script.cpp | 13 +++++++++++++ src/xrEngine/xr_level_controller.cpp | 13 +++++++++++++ src/xrEngine/xr_level_controller.h | 13 +++++++++++++ 3 files changed, 39 insertions(+) diff --git a/src/xrEngine/key_binding_registrator_script.cpp b/src/xrEngine/key_binding_registrator_script.cpp index fa04ac58c2d..fbd374ecf7d 100644 --- a/src/xrEngine/key_binding_registrator_script.cpp +++ b/src/xrEngine/key_binding_registrator_script.cpp @@ -130,6 +130,19 @@ SCRIPT_EXPORT(KeyBindings, (), value("kQUICK_LOAD", int(kQUICK_LOAD)), value("kALIFE_CMD", int(kALIFE_CMD)), + value("kNUMPAD0", int(kNUMPAD0)), + value("kNUMPAD1", int(kNUMPAD1)), + value("kNUMPAD2", int(kNUMPAD2)), + value("kNUMPAD3", int(kNUMPAD3)), + value("kNUMPAD4", int(kNUMPAD4)), + value("kNUMPAD5", int(kNUMPAD5)), + value("kNUMPAD6", int(kNUMPAD6)), + value("kNUMPAD7", int(kNUMPAD7)), + value("kNUMPAD8", int(kNUMPAD8)), + value("kNUMPAD9", int(kNUMPAD9)), + value("kNUMPADENTER", int(kNUMPADENTER)), + value("kINSERT", int(kINSERT)), + value("kCUSTOM1", int(kCUSTOM1)), value("kCUSTOM2", int(kCUSTOM2)), value("kCUSTOM3", int(kCUSTOM3)), diff --git a/src/xrEngine/xr_level_controller.cpp b/src/xrEngine/xr_level_controller.cpp index 8ea6d38d23e..25a39703900 100644 --- a/src/xrEngine/xr_level_controller.cpp +++ b/src/xrEngine/xr_level_controller.cpp @@ -127,6 +127,19 @@ game_action actions[] = { "quick_load", kQUICK_LOAD, _sp }, { "alife_command", kALIFE_CMD, _sp }, + { "numpad0", kNUMPAD0, _sp }, + { "insert", kINSERT, _sp }, + { "numpad1", kNUMPAD1, _sp }, + { "numpad2", kNUMPAD2, _sp }, + { "numpad3", kNUMPAD3, _sp }, + { "numpad4", kNUMPAD4, _sp }, + { "numpad5", kNUMPAD5, _sp }, + { "numpad6", kNUMPAD6, _sp }, + { "numpad7", kNUMPAD7, _sp }, + { "numpad8", kNUMPAD8, _sp }, + { "numpad9", kNUMPAD9, _sp }, + { "numpad_enter", kNUMPADENTER, _sp }, + { "custom1", kCUSTOM1, _sp }, { "custom2", kCUSTOM2, _sp }, { "custom3", kCUSTOM3, _sp }, diff --git a/src/xrEngine/xr_level_controller.h b/src/xrEngine/xr_level_controller.h index 5d38037391e..00237a747f1 100644 --- a/src/xrEngine/xr_level_controller.h +++ b/src/xrEngine/xr_level_controller.h @@ -108,6 +108,19 @@ enum EGameActions : u32 kQUICK_LOAD, kALIFE_CMD, + kNUMPAD0, + kINSERT, + kNUMPAD1, + kNUMPAD2, + kNUMPAD3, + kNUMPAD4, + kNUMPAD5, + kNUMPAD6, + kNUMPAD7, + kNUMPAD8, + kNUMPAD9, + kNUMPADENTER, + kCUSTOM1, kCUSTOM2, kCUSTOM3,