R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

CHostState improvements

Browse Source 
Mapped out all members, also fixed the initialization of members. Some fields were never getting initialized, and m_iCurrentState was initialized improperly.
This commit is contained in:
Kawe Mazidjatari 2023-02-18 19:18:00 +01:00
parent 19d21300a3
commit ad1f83523e
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
r5dev/engine/host_state.cpp
View File

@ -194,13 +194,18 @@ FORCEINLINE void CHostState::Init(void)
} }
} }
m_flShortFrameTime = 1.0f; m_flShortFrameTime = 1.0f;
m_bActiveGame = false;
m_bRememberLocation = false;
m_bBackgroundLevel = false;
m_bWaitingForConnection = false;
m_levelName[0] = 0; m_levelName[0] = 0;
m_landMarkName[0] = 0; m_landMarkName[0] = 0;
m_mapGroupName[0] = 0; m_mapGroupName[0] = 0;
m_nSplitScreenPlayers = 256; m_bSplitScreenConnect = false;
m_bGameHasShutDownAndFlushedMemory = true;
m_vecLocation.Init(); m_vecLocation.Init();
m_angLocation.Init(); m_angLocation.Init();
m_iCurrentState = HostStates_t::HS_NEW_GAME; m_iServerState = HostStates_t::HS_NEW_GAME;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -357,8 +362,8 @@ FORCEINLINE void CHostState::State_NewGame(void)
DevMsg(eDLL_T::ENGINE, "%s: Loading level: '%s'\n", __FUNCTION__, g_pHostState->m_levelName); DevMsg(eDLL_T::ENGINE, "%s: Loading level: '%s'\n", __FUNCTION__, g_pHostState->m_levelName);
LARGE_INTEGER time{}; LARGE_INTEGER time{};
uint16_t nSplitScreenPlayers = m_nSplitScreenPlayers; bool bSplitScreenConnect = m_bSplitScreenConnect;
m_nSplitScreenPlayers = 0; m_bSplitScreenConnect = 0;
#ifndef CLIENT_DLL #ifndef CLIENT_DLL
if (!g_pServerGameClients) // Init Game if it ain't valid. if (!g_pServerGameClients) // Init Game if it ain't valid.
{ {
@ -368,7 +373,7 @@ FORCEINLINE void CHostState::State_NewGame(void)
#ifndef CLIENT_DLL #ifndef CLIENT_DLL
if (!CModelLoader__Map_IsValid(g_pModelLoader, m_levelName) // Check if map is valid and if we can start a new game. if (!CModelLoader__Map_IsValid(g_pModelLoader, m_levelName) // Check if map is valid and if we can start a new game.
|| !Host_NewGame(m_levelName, nullptr, m_bBackgroundLevel, nSplitScreenPlayers, time) || !g_pServerGameClients) || !Host_NewGame(m_levelName, nullptr, m_bBackgroundLevel, bSplitScreenConnect, time) || !g_pServerGameClients)
{ {
Error(eDLL_T::ENGINE, NO_ERROR, "%s: Error: Level not valid\n", __FUNCTION__); Error(eDLL_T::ENGINE, NO_ERROR, "%s: Error: Level not valid\n", __FUNCTION__);
#ifndef DEDICATED #ifndef DEDICATED

4
r5dev/engine/host_state.h
View File

@ -45,7 +45,9 @@ public:
bool m_bRememberLocation; //0x0265 bool m_bRememberLocation; //0x0265
bool m_bBackgroundLevel; //0x0266 bool m_bBackgroundLevel; //0x0266
bool m_bWaitingForConnection; //0x0267 bool m_bWaitingForConnection; //0x0267
uint16_t m_nSplitScreenPlayers; //0x0268 bool m_bSplitScreenConnect; //0x0268
bool m_bGameHasShutDownAndFlushedMemory; //0x0269
HostStates_t m_iServerState; //0x026C
}; };
/* ==== CHOSTSTATE ====================================================================================================================================================== */ /* ==== CHOSTSTATE ====================================================================================================================================================== */