Moved e_event_type and e_controller_component

Author: twist84

game/game.vcxproj

@@ -305,6 +305,7 @@ copy /b $(ProjectDir)source\config\version.cpp +,, $(ProjectDir)source\config\ve
     <ClCompile Include="source\interface\gui_selected_items_saved_film.cpp" />
     <ClCompile Include="source\interface\gui_selected_items_saved_screenshot.cpp" />
     <ClCompile Include="source\interface\overhead_map.cpp" />
+    <ClCompile Include="source\interface\user_interface_data.cpp" />
     <ClCompile Include="source\interface\user_interface_main_menu_music.cpp" />
     <ClCompile Include="source\interface\user_interface_mouse.cpp" />
     <ClCompile Include="source\interface\user_interface_player_model_camera.cpp" />

game/game.vcxproj.filters

@@ -1959,6 +1959,9 @@
     <ClCompile Include="source\interface\c_gui_model_widget.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="source\interface\user_interface_data.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="source\camera\camera.hpp">

game/source/_force_includes/_force_included_enums.hpp

@@ -5242,3 +5242,67 @@ enum e_gui_location
 	k_gui_location_count,
 };
 
+enum e_event_type
+{
+	_event_type_none = 0,
+	_event_type_tab_up,
+	_event_type_tab_left,
+	_event_type_tab_down,
+	_event_type_tab_right,
+	_event_type_alt_stick_up,
+	_event_type_alt_stick_left,
+	_event_type_alt_stick_down,
+	_event_type_alt_stick_right,
+	_event_type_alt_tab_up,
+	_event_type_alt_tab_left,
+	_event_type_alt_tab_down,
+	_event_type_alt_tab_right,
+	_event_type_button_press,
+
+	k_event_type_count
+};
+
+enum e_controller_component
+{
+	_controller_component_button_a = 0,
+	_controller_component_button_b,
+	_controller_component_button_x,
+	_controller_component_button_y,
+
+	_controller_component_button_left_shoulder,
+	_controller_component_button_right_shoulder,
+
+	_controller_component_button_left_trigger,
+	_controller_component_button_right_trigger,
+
+	_controller_component_button_dpad_up,
+	_controller_component_button_dpad_down,
+	_controller_component_button_dpad_left,
+	_controller_component_button_dpad_right,
+
+	_controller_component_button_start,
+	_controller_component_button_back,
+
+	_controller_component_button_left_thumb,
+	_controller_component_button_right_thumb,
+
+	_controller_component_stick_left_thumb,
+	_controller_component_stick_right_thumb,
+
+	_controller_component_left_stick_left,
+	_controller_component_left_stick_right,
+	_controller_component_left_stick_up,
+	_controller_component_left_stick_down,
+
+	_controller_component_right_stick_left,
+	_controller_component_right_stick_right,
+	_controller_component_right_stick_up,
+	_controller_component_right_stick_down,
+
+	_controller_component_left_stick_x,
+	_controller_component_left_stick_y,
+
+	_controller_component_right_stick_x,
+	_controller_component_right_stick_y,
+};
+

game/source/interface/gui_roster_data.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "cseries/cseries.hpp"
+#include "game/players.hpp"
 #include "interface/user_interface_data.hpp"
 
 struct c_gui_roster_data :

game/source/interface/user_interface_controller.hpp

@@ -3,71 +3,6 @@
 #include "interface/c_controller.hpp"
 #include "networking/transport/transport_security.hpp"
 
-enum e_event_type
-{
-	_event_type_none = 0,
-	_event_type_tab_up,
-	_event_type_tab_left,
-	_event_type_tab_down,
-	_event_type_tab_right,
-	_event_type_alt_stick_up,
-	_event_type_alt_stick_left,
-	_event_type_alt_stick_down,
-	_event_type_alt_stick_right,
-	_event_type_alt_tab_up,
-	_event_type_alt_tab_left,
-	_event_type_alt_tab_down,
-	_event_type_alt_tab_right,
-	_event_type_button_press,
-
-	k_event_type_count
-};
-
-enum e_controller_component
-{
-	_controller_component_button_a = 0,
-	_controller_component_button_b,
-	_controller_component_button_x,
-	_controller_component_button_y,
-
-	_controller_component_button_left_shoulder,
-	_controller_component_button_right_shoulder,
-
-	_controller_component_button_left_trigger,
-	_controller_component_button_right_trigger,
-
-	_controller_component_button_dpad_up,
-	_controller_component_button_dpad_down,
-	_controller_component_button_dpad_left,
-	_controller_component_button_dpad_right,
-
-	_controller_component_button_start,
-	_controller_component_button_back,
-
-	_controller_component_button_left_thumb,
-	_controller_component_button_right_thumb,
-
-	_controller_component_any_stick,
-
-	_controller_component_unknown17,
-
-	_controller_component_left_stick_left,
-	_controller_component_left_stick_right,
-	_controller_component_left_stick_up,
-	_controller_component_left_stick_down,
-
-	_controller_component_right_stick_left,
-	_controller_component_right_stick_right,
-	_controller_component_right_stick_up,
-	_controller_component_right_stick_down,
-
-	_controller_component_left_stick_x,
-	_controller_component_left_stick_y,
-
-	_controller_component_right_stick_x,
-	_controller_component_right_stick_y,
-};
-
 struct s_event_record
 {
 	e_event_type type;

game/source/interface/user_interface_mouse.cpp

@@ -408,7 +408,7 @@ bool user_interface_mouse_handle_screen_widget(c_gui_screen_widget* screen_widge
 			if (int16 hscroll_ammount = user_interface_mouse_globals.mouse_hwheel_delta / -input_globals.mouse_wheel_delta)
 			{
 				point2d point = { .x = hscroll_ammount > 0 ? 0x7FFF : -0x7FFF };
-				event_manager_tab(0, user_interface_mouse_globals.controller_index, &point, user_interface_milliseconds(), _controller_component_any_stick);
+				event_manager_tab(0, user_interface_mouse_globals.controller_index, &point, user_interface_milliseconds(), _controller_component_stick_left_thumb);
 			}
 		}
 	}