update 2

xlive/Blam/Engine/Networking/memory/networking_memory.cpp

@@ -5,10 +5,11 @@
 uint8* network_heap_allocate_block(uint32 size)
 {
 	// ### TODO
-	return NULL;
+	return INVOKE(0x1AC939, 0x0, network_heap_allocate_block, size);
 }
 
 void network_heap_free_block(uint8* block)
 {
 	// ### TODO
+	return INVOKE(0x1AC94A, 0x0, network_heap_free_block, block);
 }

xlive/Blam/Engine/Simulation/game_interface/simulation_game_entities.cpp

@@ -6,7 +6,7 @@
 datum simulation_entity_index_to_object_index(int32 entity_index)
 {
 	// ### TODO OFFSET
-	return INVOKE(0x0, 0x0, simulation_entity_index_to_object_index, entity_index);
+	return INVOKE(0x1F2211, 0x0, simulation_entity_index_to_object_index, entity_index);
 }
 
 bool simulation_object_index_valid(datum object_index)

xlive/Blam/Engine/Simulation/game_interface/simulation_game_events.cpp

@@ -1,3 +1,2 @@
 #include "stdafx.h"
-#include "simulation_game_events.h"
-
+#include "simulation_game_events.h"

xlive/Blam/Engine/Simulation/simulation.cpp

@@ -5,13 +5,10 @@
 #include "objects/objects.h"
 #include "simulation_world.h"
 
-c_simulation_queue g_entity_update_queue;
-c_simulation_queue g_event_update_queue;
-
 c_simulation_world* simulation_get_world()
 {
 	// ### TODO offset
-	return NULL;
+	return *Memory::GetAddress<c_simulation_world**>(0x5178DC, 0x0);
 }
 
 bool simulation_query_object_is_predicted(datum object_datum)
@@ -28,134 +25,4 @@ void __cdecl simulation_process_input(uint32 player_action_mask, const player_ac
 c_simulation_type_collection* simulation_get_type_collection()
 {
     return c_simulation_type_collection::get();
-}
-
-void c_simulation_world::simulation_queue_allocate(e_event_queue_type type, int32 size, s_simulation_queue_element** out_allocated_elem)
-{
-	if (TEST_FLAG(FLAG(type), _simulation_queue_element_type_1))
-	{
-		// player event, player update, gamestate clear
-		g_event_update_queue.allocate(size, out_allocated_elem);
-	}
-	else
-	{
-		bool sim_queue_full = false;
-
-		if (TEST_FLAG(FLAG(type), _simulation_queue_element_type_2))
-		{
-			// entity_deletion, entity_promotion, game_global_event
-
-			// TODO
-			// c_simulation_queue::get_allocation_status()
-			// check the allocation status
-			// this type of elements can be skupped from being queued, in case of overflow??
-			// sim_queue_full = true;
-		}
-
-		// event, creation, update, entity_deletion, entity_promotion, game_global_event
-		g_entity_update_queue.allocate(size, out_allocated_elem);
-
-	}
-
-	if (out_allocated_elem)
-	{
-		(*out_allocated_elem)->type = type;
-	}
-}
-
-void c_simulation_world::simulation_queue_enqueue(s_simulation_queue_element* element)
-{
-	if (TEST_FLAG(FLAG(element->type), _simulation_queue_element_type_1))
-	{
-		// player event, player update, gamestate clear
-		g_event_update_queue.enqueue(element);
-	}
-	else
-	{
-		// event, creation, update, entity_deletion, entity_promotion, game_global_event
-		g_entity_update_queue.enqueue(element);
-	}
-}
-
-static void encode_object_index_reference(bitstream* stream, datum object_index_references)
-{
-	stream->data_encode_integer("gamestate-index-id", DATUM_INDEX_TO_IDENTIFIER(object_index_references), 16);
-	stream->data_encode_integer("gamestate-index-absolute", DATUM_INDEX_TO_ABSOLUTE_INDEX(object_index_references), 11);
-}
-
-static bool encode_event_to_buffer(
-	uint8* out_buffer,
-	int32 out_buffer_size,
-	int32* out_written_size,
-	e_simulation_event_type event_type,
-	int32 reference_count,
-	datum* object_index_references,
-	int32 block_size,
-	uint8* block
-)
-{
-	bitstream stream(out_buffer, out_buffer_size);
-	stream.begin_writing(k_bitstream_default_alignment);
-	stream.data_encode_integer("event-type", event_type, 5);
-	stream.data_encode_integer("reference-count", reference_count, 5);
-
-	for (int32 i = 0; i < reference_count; i++)
-	{
-		stream.data_encode_bool("object-index-exists", !DATUM_IS_NONE(object_index_references[i]));
-		if (!DATUM_IS_NONE(object_index_references[i]))
-		{
-			encode_object_index_reference(&stream, object_index_references[i]);
-		}
-	}
-
-	c_simulation_type_collection* sim_type_collection = simulation_get_type_collection();
-	c_simulation_event_definition* sim_event_definition = sim_type_collection->get_event_definition(event_type);
-	// write the event data to the stream
-	sim_event_definition->get_vtbl()->encode(sim_event_definition, block_size, block, &stream);
-
-	stream.finish_writing(NULL);
-	*out_written_size = stream.get_space_used_in_bytes();
-
-	return !stream.overflow();
-}
-
-void simulation_queue_event_insert(e_simulation_event_type type, int32 reference_count, int32* references, int32 block_size, uint8* block)
-{
-	datum object_indexes_from_entity_references[k_entity_reference_indices_count_max];
-	uint8 write_buffer[1024];
-	int32 write_buffer_space_used;
-	s_simulation_queue_element* allocated_element;
-
-	if (game_is_distributed() && !game_is_playback())
-	{
-		c_simulation_type_collection* simulation_type_collection = simulation_get_type_collection();
-		c_simulation_event_definition* event_definition = simulation_type_collection->get_event_definition(type);
-
-		// skip postprocess, not available in h2
-		// call postprocess from event def
-		// end
-
-		simulation_entity_indices_to_object_index(references, reference_count, object_indexes_from_entity_references, k_entity_reference_indices_count_max);
-
-		if (encode_event_to_buffer(
-			write_buffer,
-			sizeof(write_buffer),
-			&write_buffer_space_used,
-			type,
-			k_entity_reference_indices_count_max,
-			object_indexes_from_entity_references,
-			block_size,
-			block))
-		{
-			c_simulation_world::simulation_queue_allocate(_simulation_queue_element_type_event, write_buffer_space_used, &allocated_element);
-			if (allocated_element)
-			{
-				// copy the data to the buffer
-				csmemcpy(allocated_element->data, write_buffer, allocated_element->data_size);
-
-				// copy it to the queue
-				c_simulation_world::simulation_queue_enqueue(allocated_element);
-			}
-		}
-	}
-}
+}

xlive/Blam/Engine/Simulation/simulation.h

@@ -3,8 +3,6 @@
 #include "simulation_type_collection.h"
 #include "game/player_control.h"
 
-void simulation_queue_event_insert(e_simulation_event_type type, int32 reference_count, int32* references, int32 block_size, uint8* block);
-
 bool simulation_query_object_is_predicted(datum object_datum);
 c_simulation_type_collection* simulation_get_type_collection();
 

xlive/Blam/Engine/Simulation/simulation_events_queue.h

@@ -27,14 +27,14 @@ enum e_event_queue_type : int16
 	_simulation_queue_element_type_game_global_event = 6,
 	_simulation_queue_element_type_player_event = 7,
 	_simulation_queue_element_type_player_update_event = 8,
-	_simulation_queue_element_type_gamestate_clear = 9,
+	_simulation_queue_element_type_gamestates_clear = 9,
 
 	// probably unused, forge related
 	_simulation_queue_element_type_sandbox_event = 10,
 
 	k_simulation_queue_element_type_count,
 
-	_simulation_queue_element_type_1 = FLAG(_simulation_queue_element_type_player_event) | FLAG(_simulation_queue_element_type_player_update_event) | FLAG(_simulation_queue_element_type_gamestate_clear),
+	_simulation_queue_element_type_1 = FLAG(_simulation_queue_element_type_player_event) | FLAG(_simulation_queue_element_type_player_update_event) | FLAG(_simulation_queue_element_type_gamestates_clear),
 	_simulation_queue_element_type_2 = FLAG(_simulation_queue_element_type_entity_deletion) | FLAG(_simulation_queue_element_type_entity_promotion) | FLAG(_simulation_queue_element_type_game_global_event),
 	_simulation_queue_element_type_3 = (int16)0xffff & (int16)~(_simulation_queue_element_type_1 | _simulation_queue_element_type_2),
 };