Merge Loading screen support for RedM (pr-3337)

7675ef1 - feat(rdr3): loading screen support

Author: prikolium-cfx

code/components/config.lua

@@ -132,6 +132,7 @@ component 'gta-net-rdr3'
 component 'extra-natives-rdr3'
 component 'citizen-playernames-rdr3'
 component 'devtools-rdr3'
+component 'loading-screens-rdr3'
 
 component 'gta-game-ny'
 component 'rage-graphics-ny'

code/components/conhost-v2/src/ConsoleHostGui.cpp

@@ -914,7 +914,7 @@ static void EnsureConsoles()
 
 bool IsNonProduction()
 {
-#if !defined(GTA_FIVE) || defined(_DEBUG)
+#if (!defined(GTA_FIVE) && !defined(IS_RDR3)) || defined(_DEBUG)
 	return true;
 #else
 	static ConVar<int> moo("moo", ConVar_None, 0);

code/components/gta-net-rdr3/include/HostSystem.h

@@ -0,0 +1,46 @@
+#pragma once
+
+enum HostState
+{
+	SESSION_STATE_NONE,
+	SESSION_STATE_ENTER,
+	SESSION_STATE_START_JOINING,
+	SESSION_STATE_JOINING,
+	SESSION_STATE_JOINED,
+	SESSION_STATE_5,
+	SESSION_STATE_6,
+	SESSION_STATE_7,
+};
+
+inline const char* HostStateToString(HostState hs)
+{
+#define TS_HELPER(x) \
+	case x: \
+		return #x;
+
+	switch (hs)
+	{
+		TS_HELPER(SESSION_STATE_NONE)
+		TS_HELPER(SESSION_STATE_ENTER)
+		TS_HELPER(SESSION_STATE_START_JOINING)
+		TS_HELPER(SESSION_STATE_JOINING)
+		TS_HELPER(SESSION_STATE_JOINED)
+		TS_HELPER(SESSION_STATE_5)
+		TS_HELPER(SESSION_STATE_6)
+		TS_HELPER(SESSION_STATE_7)
+	}
+
+	return va("%d", (int)hs);
+
+#undef TS_HELPER
+}
+
+#ifdef COMPILING_GTA_NET_RDR3
+#define GTA_NET_EXPORT DLL_EXPORT
+#else
+#define GTA_NET_EXPORT DLL_IMPORT
+#endif
+
+// a1: new state
+// a2: old state
+extern GTA_NET_EXPORT fwEvent<HostState, HostState> OnHostStateTransition;

code/components/gta-net-rdr3/src/CoreNetworking.cpp

@@ -15,6 +15,8 @@
 
 NetLibrary* g_netLibrary;
 
+#include <HostSystem.h>
+
 // shared relay functions (from early rev. gta:net:five; do update!)
 #include <ws2tcpip.h>
 
@@ -699,6 +701,148 @@ static int ReturnTrue()
 	return true;
 }
 
+
+GTA_NET_EXPORT fwEvent<HostState, HostState> OnHostStateTransition;
+
+struct HostStateHolder
+{
+	HostState state;
+
+	inline bool operator==(HostState right)
+	{
+		return (state == right);
+	}
+
+	inline HostState operator=(HostState right)
+	{
+		trace("SessionState transitioning from %s to %s\n", HostStateToString(state), HostStateToString(right));
+
+		AddCrashometry("hs_state", HostStateToString(right));
+
+		OnHostStateTransition(right, state);
+		state = right;
+
+		return right;
+	}
+};
+
+struct
+{
+	HostStateHolder state;
+	int attempts;
+
+	std::string hostResult;
+
+	void handleHostResult(const std::string& str)
+	{
+		hostResult = str;
+	}
+
+	void process()
+	{
+		ICoreGameInit* cgi = Instance<ICoreGameInit>::Get();
+
+		switch (state.state)
+		{
+			case SESSION_STATE_NONE:
+			{
+				// update presence
+				_rlPresence_GamerPresence_Clear(rlPresence__m_GamerPresences);
+				_rlPresence_refreshSigninState(0);
+				_rlPresence_refreshNetworkStatus(0);
+
+				state = SESSION_STATE_ENTER;
+				break;
+			}
+			case SESSION_STATE_ENTER:
+				// wait for transition
+				if (_getCurrentTransitionState() == 0)
+				{
+					state = SESSION_STATE_START_JOINING;
+				}
+
+				break;
+
+			case SESSION_STATE_START_JOINING:
+			{
+				auto lastThread = rage::scrEngine::GetActiveThread();
+				rage::scrEngine::SetActiveThread(fakeThread.GetThread());
+
+				// transition to mp
+				_transitionToState(0x73040199);
+
+				rage::scrEngine::SetActiveThread(lastThread);
+
+				state = SESSION_STATE_JOINING;
+				break;
+			}
+			case SESSION_STATE_JOINING:
+				// wait for transition
+				if (_getCurrentTransitionState() == 0x73040199) // MP MODE
+				{
+					state = SESSION_STATE_JOINED;
+				}
+				else if (_getCurrentTransitionState() == 0x1D94DE8C || _getCurrentTransitionState() == 0) // SP MODE
+				{
+					state = SESSION_STATE_START_JOINING;
+				}
+
+				break;
+
+			case SESSION_STATE_JOINED:
+				if (g_initedPlayer)
+				{
+					state = SESSION_STATE_5;
+				}
+				else if (_getCurrentTransitionState() == 0x1D94DE8C || _getCurrentTransitionState() == 0) // SP MODE
+				{
+					state = SESSION_STATE_START_JOINING;
+				}
+
+				break;
+
+			case SESSION_STATE_5:
+				if (cgi->OneSyncEnabled)
+				{
+					if (sync::IsWaitingForTimeSync())
+					{
+						return;
+					}
+				}
+
+				static char sessionIdPtr[48];
+				memset(sessionIdPtr, 0, sizeof(sessionIdPtr));
+				joinOrHost(1, nullptr, sessionIdPtr);
+
+				state = SESSION_STATE_6;
+
+				break;
+
+			case SESSION_STATE_6:
+				struct
+				{
+					char* sessionMultiplayer;
+					char pad[16];
+					uint8_t networkInited;
+				}* networkMgr;
+
+				networkMgr = *(decltype(networkMgr)*)g_networkMgrPtr;
+
+				if (networkMgr->networkInited)
+				{
+					auto networkState = *(BYTE*)(networkMgr->sessionMultiplayer + networkStateOffset);
+
+					if (networkState == 4)
+					{
+						state = SESSION_STATE_7;
+						Instance<ICoreGameInit>::Get()->SetVariable("networkInited");
+					}
+				}
+				break;
+		}
+	}
+} hostSystem;
+
 static HookFunction hookFunction([]()
 {
 	static ConsoleCommand quitCommand("quit", [](const std::string& message)
@@ -787,139 +931,28 @@ static HookFunction hookFunction([]()
 	// pretend to have CGameScriptHandlerNetComponent always be host
 	hook::jump(hook::get_pattern("33 DB 48 85 C0 74 17 48 8B 48 10 48 85 C9 74 0E", -10), ReturnTrue);
 
-	static LoggedInt tryHostStage = 0;
-
-	static bool gameLoaded;
-
-	Instance<ICoreGameInit>::Get()->OnGameFinalizeLoad.Connect([]()
-	{
-		gameLoaded = true;
-	});
-
-	static ICoreGameInit* cgi = Instance<ICoreGameInit>::Get();
-
 	OnKillNetwork.Connect([](const char*)
 	{
-		gameLoaded = false;
 		g_initedPlayer = false;
 	});
 
 	OnMainGameFrame.Connect([]()
 	{
-		if (!gameLoaded)
+		if (Instance<ICoreGameInit>::Get()->GetGameLoaded())
 		{
-			return;
+			hostSystem.process();
 		}
 
-		switch (tryHostStage)
-		{
-		case 0:
-		{
-			// update presence
-			_rlPresence_GamerPresence_Clear(rlPresence__m_GamerPresences);
-			_rlPresence_refreshSigninState(0);
-			_rlPresence_refreshNetworkStatus(0);
-
-			tryHostStage = 1;
-			break;
-		}
-		case 1:
-			// wait for transition
-			if (_getCurrentTransitionState() == 0)
-			{
-				tryHostStage = 2;
-			}
-
-			break;
-
-		case 2:
-		{
-			auto lastThread = rage::scrEngine::GetActiveThread();
-			rage::scrEngine::SetActiveThread(fakeThread.GetThread());
-
-			// transition to mp
-			_transitionToState(0x73040199);
-
-			rage::scrEngine::SetActiveThread(lastThread);
-
-			tryHostStage = 3;
-			break;
-		}
-		case 3:
-			// wait for transition
-			if (_getCurrentTransitionState() == 0x73040199)
-			{
-				tryHostStage = 4;
-			}
-			else if (_getCurrentTransitionState() == 0x1D94DE8C || _getCurrentTransitionState() == 0)
-			{
-				tryHostStage = 2;
-			}
-
-			break;
-
-		case 4:
-			if (g_initedPlayer)
-			{
-				tryHostStage = 5;
-			}
-			else if (_getCurrentTransitionState() == 0x1D94DE8C || _getCurrentTransitionState() == 0)
-			{
-				tryHostStage = 2;
-			}
-
-			break;
-
-		case 5:
-			if (cgi->OneSyncEnabled)
-			{
-				if (sync::IsWaitingForTimeSync())
-				{
-					return;
-				}
-			}
-
-			static char sessionIdPtr[48];
-			memset(sessionIdPtr, 0, sizeof(sessionIdPtr));
-			joinOrHost(1, nullptr, sessionIdPtr);
-
-			tryHostStage = 6;
-
-			break;
-
-		case 6:
-			struct
-			{
-				char* sessionMultiplayer;
-				char pad[16];
-				uint8_t networkInited;
-			}* networkMgr;
-
-			networkMgr = *(decltype(networkMgr)*)g_networkMgrPtr;
-
-			if (networkMgr->networkInited)
-			{
-				auto networkState = *(BYTE*)(networkMgr->sessionMultiplayer + networkStateOffset);
-
-				if (networkState == 4)
-				{
-					tryHostStage = 7;
-					Instance<ICoreGameInit>::Get()->SetVariable("networkInited");
-				}
-			}
-
-			break;
-		}
 	});
 
 	static ConsoleCommand hhh("hhh", []()
 	{
-		tryHostStage = 0;
+		hostSystem.state = SESSION_STATE_NONE;
 	});
 
 	OnKillNetworkDone.Connect([]()
 	{
-		tryHostStage = 0;
+		hostSystem.state = SESSION_STATE_NONE;
 	});
 
 	// rlSession::InformPeersOfJoiner bugfix: reintroduce loop (as in, remove break; statement)