Refactored some structures

This has all the potential to break the codebase

Author: twist84

game/game.vcxproj

@@ -1380,7 +1380,6 @@ copy /b $(ProjectDir)source\config\version.cpp +,, $(ProjectDir)source\config\ve
     <ClInclude Include="source\networking\session\network_session_parameters_session.hpp" />
     <ClInclude Include="source\networking\session\network_session_parameters_ui.hpp" />
     <ClInclude Include="source\networking\session\network_session_parameter_type_collection.hpp" />
-    <ClInclude Include="source\networking\session\network_session_state.hpp" />
     <ClInclude Include="source\networking\tools\http_client.hpp" />
     <ClInclude Include="source\networking\tools\http_stream.hpp" />
     <ClInclude Include="source\networking\tools\network_blf.hpp" />

game/game.vcxproj.filters

@@ -3131,9 +3131,6 @@
     <ClInclude Include="source\tag_files\tag_resource_cache_stoler.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="source\networking\session\network_session_state.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="source\cseries\stack_walk_windows.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>

game/source/_force_includes/_force_included_enums.hpp

@@ -15,6 +15,12 @@ enum
 	k_maximum_scenario_zone_set_count = 48,
 };
 
+enum
+{
+	k_network_maximum_machines_per_session = 17,
+	k_network_maximum_players_per_session = 16,
+};
+
 enum
 {
 	_campaign_player0 = 0,
@@ -680,6 +686,24 @@ enum e_network_session_boot_reason
 	k_network_session_boot_reason_count
 };
 
+enum e_network_session_state
+{
+	_network_session_state_none = 0,
+	_network_session_state_peer_creating,
+	_network_session_state_peer_joining,
+	_network_session_state_peer_join_abort,
+	_network_session_state_peer_established,
+	_network_session_state_peer_leaving,
+	_network_session_state_host_established,
+	_network_session_state_host_disband,
+
+	//_network_session_state_host_handoff,
+	//_network_session_state_host_reestablish,
+	//_network_session_state_election,
+
+	k_network_session_state_count
+};
+
 enum e_life_cycle_join_result
 {
 	_life_cycle_join_result_none = 0,

game/source/cache/cache_files.hpp

@@ -340,11 +340,8 @@ extern void cache_files_update_main_status();
 
 struct tag_iterator
 {
-	uint32 __unknown0;
-	uint32 __unknown4;
-	int32 datum_index;
-	int32 absolute_tag_index;
-	tag group_tag;
+	c_data_iterator<void/*s_tag_instance_datum*/> iterator;
+	tag key_group_tag;
 };
 static_assert(sizeof(tag_iterator) == 0x14);
 

game/source/game/cheats.cpp

@@ -80,7 +80,7 @@ void __cdecl cheat_all_chars()
 
 		char const* tag_name = tag_get_name(tag_index);
 		if (tag_name && strstr(tag_name, "character"))
-			tag_reference_set(&references[reference_count++], iterator.group_tag, tag_name);
+			tag_reference_set(&references[reference_count++], iterator.key_group_tag, tag_name);
 	}
 
 	cheat_objects(references, reference_count);
@@ -105,9 +105,9 @@ void __cdecl cheat_all_powerups()
 			if (!VALID_INDEX(reference_count, NUMBEROF(references)))
 				break;
 
-			struct equipment_definition* equipment_definition = TAG_GET(iterator.group_tag, struct equipment_definition, tag_index);
+			struct equipment_definition* equipment_definition = TAG_GET(iterator.key_group_tag, struct equipment_definition, tag_index);
 			if (equipment_definition->equipment.spawner.count)
-				tag_reference_set(&references[reference_count++], iterator.group_tag, tag_get_name(tag_index));
+				tag_reference_set(&references[reference_count++], iterator.key_group_tag, tag_get_name(tag_index));
 		}
 
 		cheat_objects(references, reference_count);
@@ -126,9 +126,9 @@ void __cdecl cheat_all_vehicles()
 		if (!VALID_INDEX(reference_count, NUMBEROF(references)))
 			break;
 
-		struct vehicle_definition* vehicle_definition = TAG_GET(iterator.group_tag, struct vehicle_definition, tag_index);
+		struct vehicle_definition* vehicle_definition = TAG_GET(iterator.key_group_tag, struct vehicle_definition, tag_index);
 		if (vehicle_definition->unit.powered_seats.count > 0)
-			tag_reference_set(&references[reference_count++], iterator.group_tag, tag_get_name(tag_index));
+			tag_reference_set(&references[reference_count++], iterator.key_group_tag, tag_get_name(tag_index));
 	}
 
 	cheat_objects(references, reference_count);
@@ -146,7 +146,7 @@ void __cdecl cheat_all_weapons()
 		if (!VALID_INDEX(reference_count, NUMBEROF(references)))
 			break;
 
-		tag_reference_set(&references[reference_count++], iterator.group_tag, tag_get_name(tag_index));
+		tag_reference_set(&references[reference_count++], iterator.key_group_tag, tag_get_name(tag_index));
 	}
 
 	cheat_objects(references, reference_count);
@@ -170,7 +170,7 @@ bool __cdecl cheat_drop_effect(tag group_tag, char const* effect_name, int32 eff
 		return false;
 	}
 
-	real_point3d collision_position = collision.position;
+	real_point3d collision_position = collision.point;
 	real_vector3d normal = collision.plane.n;
 
 	collision_position.x -= forward->i * 0.25f;
@@ -542,7 +542,7 @@ void __cdecl cheat_spawn_warthog()
 
 		char const* tag_name = tag_get_name(tag_index);
 		if (tag_name && strstr(tag_name, "warthog"))
-			tag_reference_set(&references[reference_count++], iterator.group_tag, tag_name);
+			tag_reference_set(&references[reference_count++], iterator.key_group_tag, tag_name);
 	}
 
 	cheat_objects(references, reference_count);

game/source/game/players.hpp

@@ -202,21 +202,15 @@ struct game_machine_options
 static_assert(sizeof(game_machine_options) == 0x128);
 #pragma pack(pop)
 
-struct s_network_session_status_data_player
-{
-	s_player_identifier identifier;
-	s_player_configuration configuration;
-};
-static_assert(sizeof(s_network_session_status_data_player) == 0x1628);
-
 struct game_player_options
 {
-	bool player_valid;
+	bool valid;
 	bool player_left_game;
 	int16 user_index;
 	int32 controller_index;
 	s_machine_identifier machine_identifier;
-	s_network_session_status_data_player player_data;
+	s_player_identifier player_identifier;
+	s_player_configuration configuration_data;
 };
 static_assert(sizeof(game_player_options) == 0x1640);
 

game/source/interface/gui_screens/game_details/gui_game_details.hpp

@@ -15,6 +15,6 @@ struct c_gui_game_details :
 	}
 
 //protected:
-	s_network_session_status_data m_status_data;
+	s_network_squad_status_data m_status_data;
 };
 static_assert(sizeof(c_gui_game_details) == 0x17F60);

game/source/interface/user_interface_session.cpp

@@ -67,8 +67,8 @@ int32 __cdecl user_interface_local_player_count()
 	return INVOKE(0x00A812A0, user_interface_local_player_count);
 }
 
-//.text:00A81370 ; bool __cdecl user_interface_remote_squad_contains_local_peer(s_network_session_status_data const* status_data)
-//.text:00A81440 ; bool __cdecl user_interface_remote_squad_is_joinable(s_network_session_status_data const* status_data)
+//.text:00A81370 ; bool __cdecl user_interface_remote_squad_contains_local_peer(s_network_squad_status_data const* status_data)
+//.text:00A81440 ; bool __cdecl user_interface_remote_squad_is_joinable(s_network_squad_status_data const* status_data)
 //.text:00A81510 ; bool __cdecl user_interface_squad_can_new_user_join(int32 user_index)
 
 e_controller_index user_interface_session_get_controller_index(int32 player_index)

game/source/main/main_render.cpp

@@ -765,7 +765,7 @@ void __cdecl game_engine_render_frame_watermarks(bool pregame)
 		game_engine_render_window_watermarks(NONE);
 
 	//game_engine_render_frame_watermarks_for_controller(controller_get_first_non_guest_signed_in_controller());
-	//game_engine_render_frame_watermarks_for_controller(static_cast<e_controller_index>(DECLFUNC(0x00A94930, int16, __cdecl)()));
+	//game_engine_render_frame_watermarks_for_controller((e_controller_index)DECLFUNC(0x00A94930, int16, __cdecl)());
 	game_engine_render_frame_watermarks_for_controller(_controller0);
 }
 

game/source/main/main_time.cpp

@@ -49,16 +49,18 @@ void rasterizer_render_debug_frame_deltas()
 	bounds.x0 = int16(bounds.x1 - (50.0f * draw_string_get_glyph_scaling_for_display_settings()));
 	bounds.y0 = int16(bounds.y1 - (75.0f * draw_string_get_glyph_scaling_for_display_settings()));
 
-	for (int32 i = (rasterizer_globals.frame_delta_index + 14) % 15; i != rasterizer_globals.frame_delta_index; i = (i + 14) % 15)
+	for (int32 flip_delta_index = (rasterizer_globals.next_flip_delta_index + 14) % 15;
+		flip_delta_index != rasterizer_globals.next_flip_delta_index;
+		flip_delta_index = (flip_delta_index + 14) % 15)
 	{
 		bounds.y0 -= 20;
 		bounds.y1 -= 20;
 
 		char str[8]{};
-		csnzprintf(str, 4, "%d", rasterizer_globals.frame_deltas[i]);
+		csnzprintf(str, 4, "%d", rasterizer_globals.flip_deltas[flip_delta_index]);
 
 		real_argb_color const* color = global_real_argb_green;
-		if (rasterizer_globals.frame_deltas[i] > 2)
+		if (rasterizer_globals.flip_deltas[flip_delta_index] > 2)
 			color = global_real_argb_red;
 
 		draw_string.set_justification(_text_justification_right);