Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add keys and actions for PDA tab [CoC] #1541

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/xrEngine/key_binding_registrator_script.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand All @@ -146,6 +159,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)),
Expand Down
20 changes: 20 additions & 0 deletions src/xrEngine/xr_level_controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand All @@ -143,6 +156,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 },
Expand Down
20 changes: 20 additions & 0 deletions src/xrEngine/xr_level_controller.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -124,6 +137,13 @@ enum EGameActions : u32
kCUSTOM14,
kCUSTOM15,

kPDA_TAB1,
kPDA_TAB2,
kPDA_TAB3,
kPDA_TAB4,
kPDA_TAB5,
kPDA_TAB6,

kKICK, // alpet: kick dynamic objects

kEDITOR,
Expand Down