Implemented update_controller_properties

`c_controller_interface::update_controller_properties`
Added `managed_user_clear`
Added `gamer_achievements_begin_retrieval`
Added `user_interface_interactive_session_is_squad`
Added `network_squad_session_get_membership`

Author: twist84

game/game.vcxproj

@@ -290,6 +290,7 @@ copy /b $(ProjectDir)source\config\version.cpp +,, $(ProjectDir)source\config\ve
     <ClCompile Include="source\motor\mover.cpp" />
     <ClCompile Include="source\motor\sync_action.cpp" />
     <ClCompile Include="source\networking\logic\life_cycle\life_cycle_state_handler.cpp" />
+    <ClCompile Include="source\networking\logic\logic_managed_user.cpp" />
     <ClCompile Include="source\networking\logic\network_bandwidth.cpp" />
     <ClCompile Include="source\networking\logic\network_banhammer.cpp" />
     <ClCompile Include="source\networking\logic\network_leaderboard.cpp" />
@@ -991,6 +992,7 @@ copy /b $(ProjectDir)source\config\version.cpp +,, $(ProjectDir)source\config\ve
     <ClInclude Include="source\multithreading\threads.hpp" />
     <ClInclude Include="source\networking\delivery\network_connection.hpp" />
     <ClInclude Include="source\networking\logic\life_cycle\life_cycle_state_handler.hpp" />
+    <ClInclude Include="source\networking\logic\logic_managed_user.hpp" />
     <ClInclude Include="source\networking\logic\logic_matchmaking_seeker.hpp" />
     <ClInclude Include="source\networking\logic\logic_session_tracker.hpp" />
     <ClInclude Include="source\networking\logic\network_bandwidth.hpp" />

game/game.vcxproj.filters

@@ -1806,6 +1806,9 @@
     <ClCompile Include="source\render\render_debug_commands.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="source\networking\logic\logic_managed_user.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="source\camera\camera.hpp">
@@ -4097,6 +4100,9 @@
     <ClInclude Include="source\render\render_debug_commands.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="source\networking\logic\logic_managed_user.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resource\resource.rc">

game/source/interface/c_controller.cpp

@@ -3,9 +3,11 @@
 #include "input/input_windows.hpp"
 #include "interface/user_interface_controller.hpp"
 #include "memory/module.hpp"
+#include "networking/logic/logic_managed_user.hpp"
 #include "networking/logic/network_session_interface.hpp"
 #include "networking/network_time.hpp"
 #include "networking/online/online.hpp"
+#include "networking/online/online_achievements.hpp"
 
 HOOK_DECLARE_CLASS_MEMBER(0x00A7DE30, c_controller_interface, update_controller_properties);
 
@@ -49,7 +51,6 @@ e_window_index __cdecl controller_get_game_render_window(e_controller_index cont
 	return INVOKE(0x00A7CE80, controller_get_game_render_window, controller_index);
 
 	//ASSERT(VALID_CONTROLLER(controller_index));
-	//
 	//return controller_game_render_windows[controller_index];
 }
 
@@ -90,7 +91,7 @@ e_controller_index c_controller_interface::get_controller_index() const
 
 wchar_t const* c_controller_interface::get_display_name() const
 {
-	return m_display_name.get_string();
+	return m_display_name;
 }
 
 //.text:00A7D430 ; 
@@ -148,6 +149,7 @@ bool c_controller_interface::is_signed_in_to_machine() const
 //.text:00A7D970 ; 
 //.text:00A7D990 ; 
 //.text:00A7D9A0 ; 
+//.text:00A7D9C0 ; private: void c_controller_interface::remove_controller_from_network_session()
 //.text:00A7D9E0 ; public: void c_controller_interface::render()
 //.text:00A7DA20 ; public: void c_controller_interface::reset_user_index()
 //.text:00A7DA30 ; public: void c_controller_interface::set_as_unsigned_in_user(bool)
@@ -175,32 +177,23 @@ void c_controller_interface::sign_out_controller(bool sign_out_for_sign_in_chang
 
 void c_controller_interface::update_controller_properties()
 {
-	HOOK_INVOKE_CLASS_MEMBER(, c_controller_interface, update_controller_properties);
-	return;
-
-	// $TODO: implement me properly
+	//HOOK_INVOKE_CLASS_MEMBER(, c_controller_interface, update_controller_properties);
 
 	e_controller_index controller_index = get_controller_index();
 	bool is_signed_in = online_local_user_is_signed_in(controller_index);
-	bool attached = m_state_flags.test(_attached_bit);
-	bool has_gamepad = input_has_gamepad(controller_index);
+	bool has_gamepad = true;// input_has_gamepad(controller_index);
+	bool attached = is_attached();
+	bool is_user_signed_in = false;
 
-	long is_user_signed_in = 0;
-	if (m_user_index < 4)
+	if (VALID_INDEX(m_user_index, 4))
 	{
-		if (is_user_signed_in = network_session_interface_get_is_user_signed_in(m_user_index))
-		{
-			m_user_index = NONE;
-		}
+		is_user_signed_in = network_session_interface_get_is_user_signed_in(m_user_index);
 	}
-	else
+	else if (m_user_index != NONE && network_session_interface_get_local_user_state(m_user_index) == _network_session_interface_user_state_none)
 	{
-		if (m_user_index != NONE && network_session_interface_get_local_user_state(m_user_index) == _network_session_interface_user_state_none)
-		{
-
-		}
+		m_user_index = NONE;
 	}
-	dword time_controller_signed_out;
+
 	if (is_signed_in || m_state_flags.test(_temporary_bit))
 	{
 		qword old_player_identifier = 0;
@@ -209,92 +202,102 @@ void c_controller_interface::update_controller_properties()
 		bool is_silver_or_gold_live = false;
 		bool is_online_enabled = false;
 		bool is_free_live_gold_account = false;
+
 		if (is_user_signed_in)
 		{
-			if (m_user_index >= 4 || !network_session_interface_get_local_user_identifier(m_user_index,(s_player_identifier*)&old_player_identifier, true))
+			if (m_user_index < 4 && network_session_interface_get_local_user_identifier(m_user_index, (s_player_identifier*)&old_player_identifier, true))
+			{
+				network_session_interface_get_local_user_xuid(m_user_index);
+				//network_session_interface_is_local_user_silver_or_gold_live(m_user_index);
+				//network_session_interface_is_local_user_online_enabled(m_user_index);
+			}
+			else
 			{
 				old_player_identifier = 0;
 			}
-			network_session_interface_get_local_user_xuid(m_user_index);
-			//network_session_interface_is_local_user_silver_or_gold_live(m_user_index);
-			//network_session_interface_is_local_user_online_enabled(m_user_index);
 		}
+
 		if (is_signed_in)
 		{
 			xuid = online_local_user_get_xuid(controller_index);
 			is_silver_or_gold_live = online_local_user_is_silver_or_gold_live(controller_index);
 			is_online_enabled = online_local_user_is_online_enabled(controller_index);
 			is_free_live_gold_account = online_local_user_is_free_live_gold_account(controller_index);
 		}
+
 		bool is_user_created_content_allowed = online_local_user_is_user_created_content_allowed(controller_index);
 		bool is_friend_created_content_allowed = online_local_user_is_friend_created_content_allowed(controller_index);
-		qword player_identifier = online_local_user_get_player_identifier(controller_index);
-		new_player_identifier = player_identifier;
-		if (!is_user_signed_in || old_player_identifier != player_identifier)
+		new_player_identifier = online_local_user_get_player_identifier(controller_index);
+
+		if (!is_user_signed_in || old_player_identifier != new_player_identifier)
 		{
-			//content_catalogue_get_interface(controller_index)->dispose();
-			m_state_flags.set(_storage_device_selection_performed_bit, false);
-			//if (is_user_signed_in)
-			//	sign_out_controller(true);
-			//managed_user_clear(controller_index);
+			update_for_sign_in_change();
+
+			if (is_user_signed_in)
+				sign_out_controller(true);
+
+			managed_user_clear(controller_index);
+
 			if (!m_state_flags.test(_temporary_bit))
 			{
-				m_player_profile.m_flags |= FLAG(6);
-				//gamer_achievements_begin_retrieval(controller_index);
+				//m_player_profile->mark_for_update_from_storage()?
+				m_player_profile.m_flags |= 0x40;
+				gamer_achievements_begin_retrieval(controller_index);
 			}
+
 			sign_in_controller((s_player_identifier*)&new_player_identifier, m_state_flags.test(_temporary_bit));
 		}
+
 		if (!m_state_flags.test(_temporary_bit))
 		{
-			m_display_name.clear();
-			if (online_local_user_get_name(controller_index))
+			memset(m_display_name, 0, sizeof(m_display_name));
+			if (wchar_t const* name = online_local_user_get_name(controller_index))
 			{
-				wchar_t const* name = online_local_user_get_name(controller_index);
-				m_display_name.set(name);
+				ustrnzcpy(m_display_name, name, NUMBEROF(m_display_name));
 			}
 		}
+
 		network_session_interface_set_local_user_xuid(
 			m_user_index,
 			xuid/*,
 			is_silver_or_gold_live,
 			is_online_enabled,
 			is_free_live_gold_account,
 			is_user_created_content_allowed,
-			is_friend_created_content_allowed*/
-		);
-		goto LABEL_39;
+			is_friend_created_content_allowed*/);
 	}
-
-	if (!is_user_signed_in)
-		goto LABEL_40;
-
-	time_controller_signed_out = m_time_controller_signed_out;
-	if (!time_controller_signed_out)
-		m_time_controller_signed_out = network_time_get();
-	if (network_time_get() - time_controller_signed_out > 1000)
+	else if (is_user_signed_in)
 	{
-		sign_out_controller(false);
-		m_state_flags.clear();
-		m_display_name.clear();
-	LABEL_39:;
-		m_time_controller_signed_out = 0;
+		if (!m_time_controller_signed_out)
+		{
+			m_time_controller_signed_out = network_time_get();
+		}
+		else if (long(network_time_get() - m_time_controller_signed_out) > 1000)
+		{
+			sign_out_controller(false);
+			m_state_flags.clear();
+			memset(m_display_name, 0, sizeof(m_display_name));
+			m_time_controller_signed_out = 0;
+		}
 	}
-LABEL_40:;
+
 	m_state_flags.set(_attached_bit, has_gamepad);
+
 	if (has_gamepad != attached)
 	{
-		if (VALID_INDEX(m_user_index, 4)
-			&& network_session_interface_local_user_exists(m_user_index)
-			&& !m_state_flags.test(_temporary_bit)
-			|| m_state_flags.test(_temporary_bit))
+		if (has_gamepad && (m_user_index < 4 && network_session_interface_local_user_exists(m_user_index) && !m_state_flags.test(_temporary_bit)) || m_state_flags.test(_temporary_bit))
 		{
-			if (has_gamepad)
-				user_interface_controller_attached(controller_index);
-			else
-				user_interface_controller_detached(controller_index);
+			user_interface_controller_attached(controller_index);
+		}
+		else if (!has_gamepad && (m_user_index < 4 && network_session_interface_local_user_exists(m_user_index) && !m_state_flags.test(_temporary_bit)) || m_state_flags.test(_temporary_bit))
+		{
+			user_interface_controller_detached(controller_index);
 		}
 	}
 }
 
-//.text:00A7E150 ; private: void c_controller_interface::update_for_sign_in_change()
+void c_controller_interface::update_for_sign_in_change()
+{
+	INVOKE_CLASS_MEMBER(0x00A7E150, c_controller_interface, update_for_sign_in_change);
+}
 

game/source/interface/c_controller.hpp

@@ -24,6 +24,7 @@ struct c_controller_interface
 	void sign_in_controller(s_player_identifier const* player_identifier, bool is_temporary);
 	void sign_out_controller(bool sign_out_for_sign_in_change);
 	void update_controller_properties();
+	void update_for_sign_in_change();
 
 //protected:
 	// 4066
@@ -56,7 +57,7 @@ struct c_controller_interface
 	short m_user_index;
 	dword __unknown4;
 	c_player_profile_interface m_player_profile;
-	c_static_wchar_string<16> m_display_name;
+	wchar_t m_display_name[16];
 	qword m_hash_bits;
 	qword m_hash_bits_last_game_instance;
 	c_static_flags<k_achievement_count> m_achievements;

game/source/interface/user_interface_session.cpp

@@ -44,7 +44,12 @@ e_session_game_start_status __cdecl user_interface_get_session_game_start_status
 //.text:00A81120 ; bool __cdecl user_interface_group_is_local_player(long player_index)
 //.text:00A81190 ; bool __cdecl user_interface_group_is_player_valid(long player_index)
 //.text:00A811F0 ; bool __cdecl user_interface_interactive_session_is_group()
-//.text:00A81230 ; bool __cdecl user_interface_interactive_session_is_squad()
+
+bool __cdecl user_interface_interactive_session_is_squad()
+{
+	return INVOKE(0x00A81230, user_interface_interactive_session_is_squad);
+}
+
 //.text:00A81270 ; void __cdecl user_interface_leave_game()
 
 void __cdecl user_interface_leave_sessions(e_user_interface_session_leave_type leave_type, e_user_interface_session_leave_reason leave_reason)

game/source/interface/user_interface_session.hpp

@@ -12,6 +12,7 @@ struct s_saved_film_description;
 
 extern bool __cdecl user_interface_squad_set_session_advertisement(e_gui_network_session_advertisement_mode advertisement_mode);
 extern e_session_game_start_status __cdecl user_interface_get_session_game_start_status(e_session_game_start_error* error, dword* player_error_mask);
+extern bool __cdecl user_interface_interactive_session_is_squad();
 extern void __cdecl user_interface_leave_sessions(e_user_interface_session_leave_type leave_type, e_user_interface_session_leave_reason leave_reason);
 extern long __cdecl user_interface_local_player_count();
 extern e_controller_index user_interface_session_get_controller_index(long player_index);

game/source/networking/logic/logic_managed_user.cpp

@@ -0,0 +1,9 @@
+#include "networking/logic/logic_managed_user.hpp"
+
+#include "cseries/cseries.hpp"
+
+void __cdecl managed_user_clear(e_controller_index controller_index)
+{
+	INVOKE(0x004D25F0, managed_user_clear, controller_index);
+}
+

game/source/networking/logic/logic_managed_user.hpp

@@ -0,0 +1,5 @@
+#pragma once
+
+enum e_controller_index;
+extern void __cdecl managed_user_clear(e_controller_index controller_index);
+

game/source/networking/logic/network_session_interface.cpp

@@ -111,7 +111,7 @@ void __cdecl network_session_interface_dispose()
 	INVOKE(0x00436210, network_life_cycle_squad_session_get_ui_game_mode);
 }
 
-//.text:00436230 ; 
+//.text:00436230 ; long __cdecl network_session_interface_find_unused_local_user()
 //.text:00436250 ; void __cdecl simulation_debug_globals_get_game_network_quality(s_network_game_quality*)
 
 bool __cdecl network_session_interface_get_is_user_signed_in(long user_index)
@@ -131,11 +131,11 @@ bool __cdecl network_session_interface_get_live_connection_info(s_transport_qos_
 }
 
 //.text:00436450 ; e_network_rough_quality __cdecl get_local_framerate_quality()
-//.text:004364A0 ; 
+//.text:004364A0 ; long __cdecl network_session_interface_get_local_user_count()
 
-bool __cdecl network_session_interface_get_local_user_identifier(long user_index, s_player_identifier* player_identifier, bool a3)
+bool __cdecl network_session_interface_get_local_user_identifier(long user_index, s_player_identifier* player_identifier, bool allow_users_in_erroneous_states)
 {
-	return INVOKE(0x004364D0, network_session_interface_get_local_user_identifier, user_index, player_identifier, a3);
+	return INVOKE(0x004364D0, network_session_interface_get_local_user_identifier, user_index, player_identifier, allow_users_in_erroneous_states);
 }
 
 bool __cdecl network_session_interface_get_local_user_properties(long user_index, e_controller_index* controller_index, s_player_configuration* player_data, dword* player_voice_settings)
@@ -166,7 +166,7 @@ qword __cdecl network_session_interface_get_local_user_xuid(long user_index)
 	return INVOKE(0x004365A0, network_session_interface_get_local_user_xuid, user_index);
 }
 
-//.text:004365C0 ; 
+//.text:004365C0 ; long __cdecl network_session_interface_get_team_index(long)
 
 void __cdecl network_session_interface_handle_message(e_session_network_message message)
 {
@@ -178,7 +178,7 @@ bool __cdecl network_session_interface_initialize(c_network_session_manager* ses
 	return INVOKE(0x00436710, network_session_interface_initialize, session_manager);
 }
 
-//.text:00436790 ; 
+//.text:00436790 ; bool __cdecl network_session_interface_invalidate_map_progress()
 
 bool __cdecl network_session_interface_local_user_exists(long user_index)
 {
@@ -217,8 +217,8 @@ void __cdecl network_session_interface_reset(long session_index)
 	//for (long user_index = 0; user_index < k_number_of_users; user_index++)
 	//{
 	//	s_network_session_interface_user& user = session_interface_globals.users[user_index];
-	//	user.__times1680[session_index] = 0;
-	//	user.__times168C[session_index] = 0;
+	//	user.user_update_timestamp[session_index] = 0;
+	//	user.user_remove_timestamp[session_index] = 0;
 	//}
 }
 
@@ -379,7 +379,12 @@ bool __cdecl network_squad_session_controls_coop_game_options(bool* is_leader)
 //.text:00438F10 ; e_matchmaking_search_preference __cdecl network_squad_session_get_matchmaking_search_preference()
 //.text:00438F70 ; long __cdecl network_squad_session_get_matchmaking_tip()
 //.text:00438FF0 ; long __cdecl network_squad_session_get_maximum_player_count()
-//.text:00439020 ; bool __cdecl network_squad_session_get_membership(long*, long*, long*, long*, long*, dword*, s_network_session_peer const**, long*, dword*, s_network_session_player const**)
+
+bool __cdecl network_squad_session_get_membership(long* update_number, long* local_peer_index, long* host_peer_index, long* leader_peer_index, long* peer_count, dword* peer_valid_flags, s_network_session_peer const** peers, long* player_count, dword* player_valid_flags, s_network_session_player const** players)
+{
+	return INVOKE(0x00439020, network_squad_session_get_membership, update_number, local_peer_index, host_peer_index, leader_peer_index, peer_count, peer_valid_flags, peers, player_count, player_valid_flags, players);
+}
+
 //.text:00439080 ; 
 //.text:004390D0 ; e_network_session_class __cdecl network_squad_session_get_session_class()
 //.text:00439110 ; wchar_t const* __cdecl network_squad_session_get_session_name()