Skip to content

Commit 5eceeed

Browse files
Xottab-DUTYXottab-DUTY
committed
xr_input_xinput.h|cpp: reformatting
Also I removed one #ifdef COC_KICK
1 parent 686f5db commit 5eceeed

File tree

2 files changed

+103
-107
lines changed

2 files changed

+103
-107
lines changed

‎src/xrEngine/xr_input_xinput.cpp‎

Lines changed: 102 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -8,113 +8,111 @@ ENGINE_API _key_group g_current_keygroup = _sp;
88

99
// clang-format off
1010
_action actions[] = {
11-
{ "left", kLEFT, _both },
12-
{ "right", kRIGHT, _both },
13-
{ "up", kUP, _both },
14-
{ "down", kDOWN, _both },
15-
{ "jump", kJUMP, _both },
16-
{ "crouch", kCROUCH, _both },
17-
{ "accel", kACCEL, _both },
18-
{ "sprint_toggle", kSPRINT_TOGGLE, _both },
19-
20-
{ "forward", kFWD, _both },
21-
{ "back", kBACK, _both },
22-
{ "lstrafe", kL_STRAFE, _both },
23-
{ "rstrafe", kR_STRAFE, _both },
24-
25-
{ "llookout", kL_LOOKOUT, _both },
26-
{ "rlookout", kR_LOOKOUT, _both },
27-
28-
{ "cam_1", kCAM_1, _both },
29-
{ "cam_2", kCAM_2, _both },
30-
{ "cam_3", kCAM_3, _both },
31-
{ "cam_zoom_in", kCAM_ZOOM_IN, _both },
32-
{ "cam_zoom_out", kCAM_ZOOM_OUT, _both },
33-
34-
{ "torch", kTORCH, _both },
35-
{ "night_vision", kNIGHT_VISION, _both },
36-
{ "show_detector", kDETECTOR, _sp },
37-
38-
{ "wpn_1", kWPN_1, _both },
39-
{ "wpn_2", kWPN_2, _both },
40-
{ "wpn_3", kWPN_3, _both },
41-
{ "wpn_4", kWPN_4, _both },
42-
{ "wpn_5", kWPN_5, _both },
43-
{ "wpn_6", kWPN_6, _both },
44-
{ "artefact", kARTEFACT, _both /*_mp*/ },
45-
{ "wpn_next", kWPN_NEXT, _both }, // means next ammo type
46-
{ "wpn_fire", kWPN_FIRE, _both },
47-
{ "wpn_zoom", kWPN_ZOOM, _both },
48-
{ "wpn_zoom_inc", kWPN_ZOOM_INC, _both },
49-
{ "wpn_zoom_dec", kWPN_ZOOM_DEC, _both },
50-
{ "wpn_reload", kWPN_RELOAD, _both },
51-
{ "wpn_func", kWPN_FUNC, _both },
11+
{ "left", kLEFT, _both },
12+
{ "right", kRIGHT, _both },
13+
{ "up", kUP, _both },
14+
{ "down", kDOWN, _both },
15+
{ "jump", kJUMP, _both },
16+
{ "crouch", kCROUCH, _both },
17+
{ "accel", kACCEL, _both },
18+
{ "sprint_toggle", kSPRINT_TOGGLE, _both },
19+
20+
{ "forward", kFWD, _both },
21+
{ "back", kBACK, _both },
22+
{ "lstrafe", kL_STRAFE, _both },
23+
{ "rstrafe", kR_STRAFE, _both },
24+
25+
{ "llookout", kL_LOOKOUT, _both },
26+
{ "rlookout", kR_LOOKOUT, _both },
27+
28+
{ "cam_1", kCAM_1, _both },
29+
{ "cam_2", kCAM_2, _both },
30+
{ "cam_3", kCAM_3, _both },
31+
{ "cam_zoom_in", kCAM_ZOOM_IN, _both },
32+
{ "cam_zoom_out", kCAM_ZOOM_OUT, _both },
33+
34+
{ "torch", kTORCH, _both },
35+
{ "night_vision", kNIGHT_VISION, _both },
36+
{ "show_detector", kDETECTOR, _sp },
37+
38+
{ "wpn_1", kWPN_1, _both },
39+
{ "wpn_2", kWPN_2, _both },
40+
{ "wpn_3", kWPN_3, _both },
41+
{ "wpn_4", kWPN_4, _both },
42+
{ "wpn_5", kWPN_5, _both },
43+
{ "wpn_6", kWPN_6, _both },
44+
{ "artefact", kARTEFACT, _both /*_mp*/ },
45+
{ "wpn_next", kWPN_NEXT, _both }, // means next ammo type
46+
{ "wpn_fire", kWPN_FIRE, _both },
47+
{ "wpn_zoom", kWPN_ZOOM, _both },
48+
{ "wpn_zoom_inc", kWPN_ZOOM_INC, _both },
49+
{ "wpn_zoom_dec", kWPN_ZOOM_DEC, _both },
50+
{ "wpn_reload", kWPN_RELOAD, _both },
51+
{ "wpn_func", kWPN_FUNC, _both },
5252
{ "wpn_firemode_prev", kWPN_FIREMODE_PREV, _both },
5353
{ "wpn_firemode_next", kWPN_FIREMODE_NEXT, _both },
5454

55-
{ "pause", kPAUSE, _both },
56-
{ "drop", kDROP, _both },
57-
{ "use", kUSE, _both },
58-
{ "scores", kSCORES, _both },
59-
{ "chat", kCHAT, _both },
60-
{ "chat_team", kCHAT_TEAM, _both },
61-
{ "screenshot", kSCREENSHOT, _both },
62-
{ "quit", kQUIT, _both },
63-
{ "console", kCONSOLE, _both },
64-
{ "inventory", kINVENTORY, _both },
65-
{ "buy_menu", kBUY, _both },
66-
{ "skin_menu", kSKIN, _both },
67-
{ "team_menu", kTEAM, _both },
68-
{ "active_jobs", kACTIVE_JOBS, _sp },
69-
70-
{ "vote_begin", kVOTE_BEGIN, _both },
71-
{ "show_admin_menu", kSHOW_ADMIN_MENU, _both },
72-
{ "vote", kVOTE, _both },
73-
{ "vote_yes", kVOTEYES, _both },
74-
{ "vote_no", kVOTENO, _both },
75-
76-
{ "next_slot", kNEXT_SLOT, _both },
77-
{ "prev_slot", kPREV_SLOT, _both },
78-
79-
{ "speech_menu_0", kSPEECH_MENU_0, _both },
80-
{ "speech_menu_1", kSPEECH_MENU_1, _both },
81-
82-
{ "quick_use_1", kQUICK_USE_1, _both },
83-
{ "quick_use_2", kQUICK_USE_2, _both },
84-
{ "quick_use_3", kQUICK_USE_3, _both },
85-
{ "quick_use_4", kQUICK_USE_4, _both },
86-
87-
{ "quick_save", kQUICK_SAVE, _sp },
88-
{ "quick_load", kQUICK_LOAD, _sp },
89-
//{ "alife_command", kALIFE_CMD, _sp},
90-
91-
{ "custom1", kCUSTOM1, _sp },
92-
{ "custom2", kCUSTOM2, _sp },
93-
{ "custom3", kCUSTOM3, _sp },
94-
{ "custom4", kCUSTOM4, _sp },
95-
{ "custom5", kCUSTOM5, _sp },
96-
{ "custom6", kCUSTOM6, _sp },
97-
{ "custom7", kCUSTOM7, _sp },
98-
{ "custom8", kCUSTOM8, _sp },
99-
{ "custom9", kCUSTOM9, _sp },
100-
{ "custom10", kCUSTOM10, _sp },
101-
{ "custom11", kCUSTOM11, _sp },
102-
{ "custom12", kCUSTOM12, _sp },
103-
{ "custom13", kCUSTOM13, _sp },
104-
{ "custom14", kCUSTOM14, _sp },
105-
{ "custom15", kCUSTOM15, _sp },
106-
{ "cam_autoaim", kCAM_AUTOAIM, _sp },
107-
{ "pda_tab1", kPDA_TAB1, _sp },
108-
{ "pda_tab2", kPDA_TAB2, _sp },
109-
{ "pda_tab3", kPDA_TAB3, _sp },
110-
{ "pda_tab4", kPDA_TAB4, _sp },
111-
{ "pda_tab5", kPDA_TAB5, _sp },
112-
{ "pda_tab6", kPDA_TAB6, _sp },
113-
#ifdef COC_KICK
114-
{ "kick", kKICK, _sp },
115-
#endif
116-
117-
{ nullptr, kLASTACTION, _both }
55+
{ "pause", kPAUSE, _both },
56+
{ "drop", kDROP, _both },
57+
{ "use", kUSE, _both },
58+
{ "scores", kSCORES, _both },
59+
{ "chat", kCHAT, _both },
60+
{ "chat_team", kCHAT_TEAM, _both },
61+
{ "screenshot", kSCREENSHOT, _both },
62+
{ "quit", kQUIT, _both },
63+
{ "console", kCONSOLE, _both },
64+
{ "inventory", kINVENTORY, _both },
65+
{ "buy_menu", kBUY, _both },
66+
{ "skin_menu", kSKIN, _both },
67+
{ "team_menu", kTEAM, _both },
68+
{ "active_jobs", kACTIVE_JOBS, _sp },
69+
70+
{ "vote_begin", kVOTE_BEGIN, _both },
71+
{ "show_admin_menu", kSHOW_ADMIN_MENU, _both },
72+
{ "vote", kVOTE, _both },
73+
{ "vote_yes", kVOTEYES, _both },
74+
{ "vote_no", kVOTENO, _both },
75+
76+
{ "next_slot", kNEXT_SLOT, _both },
77+
{ "prev_slot", kPREV_SLOT, _both },
78+
79+
{ "speech_menu_0", kSPEECH_MENU_0, _both },
80+
{ "speech_menu_1", kSPEECH_MENU_1, _both },
81+
82+
{ "quick_use_1", kQUICK_USE_1, _both },
83+
{ "quick_use_2", kQUICK_USE_2, _both },
84+
{ "quick_use_3", kQUICK_USE_3, _both },
85+
{ "quick_use_4", kQUICK_USE_4, _both },
86+
87+
{ "quick_save", kQUICK_SAVE, _sp },
88+
{ "quick_load", kQUICK_LOAD, _sp },
89+
//{ "alife_command", kALIFE_CMD, _sp},
90+
91+
{ "custom1", kCUSTOM1, _sp },
92+
{ "custom2", kCUSTOM2, _sp },
93+
{ "custom3", kCUSTOM3, _sp },
94+
{ "custom4", kCUSTOM4, _sp },
95+
{ "custom5", kCUSTOM5, _sp },
96+
{ "custom6", kCUSTOM6, _sp },
97+
{ "custom7", kCUSTOM7, _sp },
98+
{ "custom8", kCUSTOM8, _sp },
99+
{ "custom9", kCUSTOM9, _sp },
100+
{ "custom10", kCUSTOM10, _sp },
101+
{ "custom11", kCUSTOM11, _sp },
102+
{ "custom12", kCUSTOM12, _sp },
103+
{ "custom13", kCUSTOM13, _sp },
104+
{ "custom14", kCUSTOM14, _sp },
105+
{ "custom15", kCUSTOM15, _sp },
106+
{ "cam_autoaim", kCAM_AUTOAIM, _sp },
107+
{ "pda_tab1", kPDA_TAB1, _sp },
108+
{ "pda_tab2", kPDA_TAB2, _sp },
109+
{ "pda_tab3", kPDA_TAB3, _sp },
110+
{ "pda_tab4", kPDA_TAB4, _sp },
111+
{ "pda_tab5", kPDA_TAB5, _sp },
112+
{ "pda_tab6", kPDA_TAB6, _sp },
113+
{ "kick", kKICK, _sp },
114+
115+
{ nullptr, kLASTACTION, _both }
118116
};
119117

120118
_keyboard keyboards[] =

‎src/xrEngine/xr_input_xinput.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ enum EGameActions
8383

8484
kQUICK_SAVE,
8585
kQUICK_LOAD,
86-
// kALIFE_CMD,
86+
//kALIFE_CMD,
8787

8888
kCUSTOM1,
8989
kCUSTOM2,
@@ -110,9 +110,7 @@ enum EGameActions
110110
kPDA_TAB5,
111111
kPDA_TAB6,
112112

113-
#ifdef COC_KICK
114113
kKICK, // alpet: kick dynamic objects
115-
#endif
116114

117115
kLASTACTION,
118116
kNOTBINDED,

0 commit comments

Comments
 (0)