Skip to content

Commit

Permalink
Returned game actions from Shadow of Chernobyl
Browse files Browse the repository at this point in the history
  • Loading branch information
@Xottab-DUTY
Xottab-DUTY committed Mar 17, 2019
1 parent 9370edb commit 8d9d53f
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 4 deletions.
22 changes: 20 additions & 2 deletions src/xrEngine/xr_input_xinput.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ _action actions[] = {
{ "down", kDOWN, _both },
{ "jump", kJUMP, _both },
{ "crouch", kCROUCH, _both },
{ "crouch_toggle", kCROUCH_TOGGLE, _both},
{ "accel", kACCEL, _both },
{ "sprint_toggle", kSPRINT_TOGGLE, _both },

Expand All @@ -25,11 +26,15 @@ _action actions[] = {
{ "llookout", kL_LOOKOUT, _both },
{ "rlookout", kR_LOOKOUT, _both },

{ "turn_engine", kENGINE, _sp},

{ "cam_1", kCAM_1, _both },
{ "cam_2", kCAM_2, _both },
{ "cam_3", kCAM_3, _both },
{ "cam_4", kCAM_4, _both},
{ "cam_zoom_in", kCAM_ZOOM_IN, _both },
{ "cam_zoom_out", kCAM_ZOOM_OUT, _both },
{ "cam_autoaim", kCAM_AUTOAIM, _sp },

{ "torch", kTORCH, _both },
{ "night_vision", kNIGHT_VISION, _both },
Expand Down Expand Up @@ -66,6 +71,9 @@ _action actions[] = {
{ "skin_menu", kSKIN, _both },
{ "team_menu", kTEAM, _both },
{ "active_jobs", kACTIVE_JOBS, _sp },
{ "map", kMAP, _both },
{ "contacts", kCONTACTS, _sp },
{ "ext_1", kEXT_1, _both },

{ "vote_begin", kVOTE_BEGIN, _both },
{ "show_admin_menu", kSHOW_ADMIN_MENU, _both },
Expand All @@ -79,6 +87,18 @@ _action actions[] = {
{ "speech_menu_0", kSPEECH_MENU_0, _both },
{ "speech_menu_1", kSPEECH_MENU_1, _both },

{ "speech_menu_2", kSPEECH_MENU_2, _mp },
{ "speech_menu_3", kSPEECH_MENU_3, _mp },
{ "speech_menu_4", kSPEECH_MENU_4, _mp },
{ "speech_menu_5", kSPEECH_MENU_5, _mp },
{ "speech_menu_6", kSPEECH_MENU_6, _mp },
{ "speech_menu_7", kSPEECH_MENU_7, _mp },
{ "speech_menu_8", kSPEECH_MENU_8, _mp },
{ "speech_menu_9", kSPEECH_MENU_9, _mp },

{ "use_bandage", kUSE_BANDAGE, _sp },
{ "use_medkit", kUSE_MEDKIT, _sp },

{ "quick_use_1", kQUICK_USE_1, _both },
{ "quick_use_2", kQUICK_USE_2, _both },
{ "quick_use_3", kQUICK_USE_3, _both },
Expand All @@ -104,8 +124,6 @@ _action actions[] = {
{ "custom14", kCUSTOM14, _sp },
{ "custom15", kCUSTOM15, _sp },

{ "cam_autoaim", kCAM_AUTOAIM, _sp },

{ "pda_tab1", kPDA_TAB1, _sp },
{ "pda_tab2", kPDA_TAB2, _sp },
{ "pda_tab3", kPDA_TAB3, _sp },
Expand Down
21 changes: 19 additions & 2 deletions src/xrEngine/xr_input_xinput.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ enum EGameActions
kDOWN,
kJUMP,
kCROUCH,
kCROUCH_TOGGLE,
kACCEL,
kSPRINT_TOGGLE,

Expand All @@ -23,11 +24,15 @@ enum EGameActions
kL_LOOKOUT,
kR_LOOKOUT,

kENGINE,

kCAM_1,
kCAM_2,
kCAM_3,
kCAM_4,
kCAM_ZOOM_IN,
kCAM_ZOOM_OUT,
kCAM_AUTOAIM,

kTORCH,
kNIGHT_VISION,
Expand Down Expand Up @@ -63,6 +68,9 @@ enum EGameActions
kSKIN,
kTEAM,
kACTIVE_JOBS,
kMAP,
kCONTACTS,
kEXT_1,

kVOTE_BEGIN,
kSHOW_ADMIN_MENU,
Expand All @@ -75,6 +83,17 @@ enum EGameActions

kSPEECH_MENU_0,
kSPEECH_MENU_1,
kSPEECH_MENU_2,
kSPEECH_MENU_3,
kSPEECH_MENU_4,
kSPEECH_MENU_5,
kSPEECH_MENU_6,
kSPEECH_MENU_7,
kSPEECH_MENU_8,
kSPEECH_MENU_9,

kUSE_BANDAGE,
kUSE_MEDKIT,

kQUICK_USE_1,
kQUICK_USE_2,
Expand All @@ -101,8 +120,6 @@ enum EGameActions
kCUSTOM14,
kCUSTOM15,

kCAM_AUTOAIM,

kPDA_TAB1,
kPDA_TAB2,
kPDA_TAB3,
Expand Down

1 comment on commit 8d9d53f

@Xottab-DUTY
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Related to #382 and #392

Please sign in to comment.