Skip to content

Commit 43de291

Browse files
twist84twist84
committed
Updated e_controller_component 
1 parent 7c04830 commit 43de291

File tree

4 files changed

+36
-37
lines changed

4 files changed

+36
-37
lines changed

‎game/source/interface/gui_screens/start_menu/panes/settings_appearance_colors/start_menu_settings_appearance_colors.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@ bool __cdecl parse_xml_emblem3(void* this_ptr, wchar_t* buffer, long buffer_leng
191191
// case _controller_component_button_x:
192192
// //player_emblem_toggle_alternate_emblem_foreground(controller_index);
193193
// return true;
194-
// case _controller_component_button_left_stick:
194+
// case _controller_component_button_left_thumb:
195195
// //player_emblem_toggle_flip_emblem_foreground(controller_index);
196196
// return true;
197-
// case _controller_component_button_right_stick:
197+
// case _controller_component_button_right_thumb:
198198
// //player_emblem_toggle_flip_emblem_background(controller_index);
199199
// return true;
200200
// }

‎game/source/interface/user_interface_controller.cpp‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,61 +21,56 @@ HOOK_DECLARE(0x00A95170, user_interface_controller_update_network_properties);
2121
//.text:00A934C0 ; bool __cdecl dpad_button_tabbed(bool, byte, word)
2222
//.text:00A93500 ; void __cdecl event_manager_alt_stick_depressed(e_controller_index, point2d const*, e_controller_component)
2323

24-
void __cdecl event_manager_button_pressed(e_controller_index controller_index, char gamepad_button)
24+
void __cdecl event_manager_button_pressed(e_controller_index controller_index, byte button)
2525
{
2626
//INVOKE(0x00A935C0, event_manager_button_pressed, controller_index, gamepad_button);
2727

28-
s_event_record event_record = {};
28+
s_event_record event = {};
2929

30-
event_record.type = _event_type_button_press;
31-
event_record.controller = controller_index;
32-
switch (gamepad_button)
30+
event.type = _event_type_button_press;
31+
event.controller = controller_index;
32+
switch (button)
3333
{
3434
case _button_action_left_trigger:
35-
event_record.component = _controller_component_button_left_trigger;
35+
event.component = _controller_component_button_left_trigger;
3636
break;
3737
case _button_action_right_trigger:
38-
event_record.component = _controller_component_button_right_trigger;
39-
break;
40-
case _button_action_dpad_up:
41-
case _button_action_dpad_down:
42-
case _button_action_dpad_left:
43-
case _button_action_dpad_right:
38+
event.component = _controller_component_button_right_trigger;
4439
break;
4540
case _button_action_start:
46-
event_record.component = _controller_component_button_start;
41+
event.component = _controller_component_button_start;
4742
break;
4843
case _button_action_back:
49-
event_record.component = _controller_component_button_back;
44+
event.component = _controller_component_button_back;
5045
break;
5146
case _button_action_left_stick:
52-
event_record.component = _controller_component_button_left_stick;
47+
event.component = _controller_component_button_left_thumb;
5348
break;
5449
case _button_action_right_stick:
55-
event_record.component = _controller_component_button_right_stick;
50+
event.component = _controller_component_button_right_thumb;
5651
break;
5752
case _button_action_a:
58-
event_record.component = _controller_component_button_a;
53+
event.component = _controller_component_button_a;
5954
break;
6055
case _button_action_b:
61-
event_record.component = _controller_component_button_b;
56+
event.component = _controller_component_button_b;
6257
break;
6358
case _button_action_x:
64-
event_record.component = _controller_component_button_x;
59+
event.component = _controller_component_button_x;
6560
break;
6661
case _button_action_y:
67-
event_record.component = _controller_component_button_y;
62+
event.component = _controller_component_button_y;
6863
break;
6964
case _button_action_right_bumper:
70-
event_record.component = _controller_component_button_left_bumper;
65+
event.component = _controller_component_button_right_shoulder;
7166
break;
7267
case _button_action_left_bumper:
73-
event_record.component = _controller_component_button_right_bumper;
68+
event.component = _controller_component_button_left_shoulder;
7469
break;
7570
}
76-
event_record.value = 0xFF;
71+
event.value = 0xFF;
7772

78-
user_interface_controller_input_event_submit(&event_record);
73+
user_interface_controller_input_event_submit(&event);
7974
}
8075

8176
void __cdecl event_manager_tab_fix_for_double_press(long gamepad_stick, e_controller_index controller_index, point2d const* vector, dword now, e_controller_component component)

‎game/source/interface/user_interface_controller.hpp‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ enum e_controller_component
2929
_controller_component_button_x,
3030
_controller_component_button_y,
3131

32-
_controller_component_button_right_bumper,
33-
_controller_component_button_left_bumper,
32+
_controller_component_button_left_shoulder,
33+
_controller_component_button_right_shoulder,
3434

3535
_controller_component_button_left_trigger,
3636
_controller_component_button_right_trigger,
@@ -43,8 +43,8 @@ enum e_controller_component
4343
_controller_component_button_start,
4444
_controller_component_button_back,
4545

46-
_controller_component_button_left_stick,
47-
_controller_component_button_right_stick,
46+
_controller_component_button_left_thumb,
47+
_controller_component_button_right_thumb,
4848

4949
_controller_component_any_stick,
5050

@@ -135,11 +135,17 @@ static_assert(sizeof(s_user_interface_controller_globals) == 0xF8);
135135

136136
extern s_user_interface_controller_globals& g_user_interface_controller_globals;
137137

138-
extern void __cdecl event_manager_button_pressed(e_controller_index controller_index, char gamepad_button);
138+
extern void __cdecl event_manager_button_pressed(e_controller_index controller_index, byte button);
139139
extern void __cdecl event_manager_tab(long gamepad_stick, e_controller_index controller_index, point2d const* vector, dword now, e_controller_component component);
140-
extern void __cdecl user_interface_controller_detached(e_controller_index controller_index);
141140
extern void __cdecl user_interface_controller_attached(e_controller_index controller_index);
142-
extern void __cdecl user_interface_controller_input_event_submit(s_event_record* event_record);
141+
extern void __cdecl user_interface_controller_detached(e_controller_index controller_index);
142+
extern s_user_interface_controller* __cdecl user_interface_controller_get(e_controller_index controller_index);
143+
extern bool __cdecl user_interface_controller_get_player_configuration(e_controller_index controller_index, s_player_identifier* player_identifier, s_player_configuration* player_data);
144+
extern void __cdecl user_interface_controller_input_event_submit(s_event_record* event);
145+
extern bool __cdecl user_interface_controller_is_player_profile_valid(e_controller_index controller_index);
146+
extern void __cdecl user_interface_controller_reset(e_controller_index controller_index);
143147
extern void __cdecl user_interface_controller_set_user_index(e_controller_index controller_index, long user_index);
148+
extern void __cdecl user_interface_controller_switch_to_offline(e_controller_index controller_index);
144149
extern void __cdecl user_interface_controller_update();
150+
extern void __cdecl user_interface_controller_update_network_properties(e_controller_index controller_index);
145151

‎game/source/networking/network_globals.hpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ struct s_network_globals
44
{
55
bool initialized;
66
bool entered;
7-
8-
// halo 3: thread_id = system_get_current_thread_id()
9-
// halo reach: thread_index = get_current_thread_index()
10-
// halo online: unused
117
unsigned long thread_id;
8+
9+
// $TODO: add back all the missing globals
1210
};
1311

1412
extern struct c_network_session_parameter_type_collection*& g_network_parameter_types;

0 commit comments

Comments
 (0)