Browse Source

Ensure the net client doesn't do evil stuff before we're launched

Adam Johnson 10 years ago
parent
commit
e48a98bcf4
  1. 3
      Sources/Plasma/Apps/plClient/plClient.cpp
  2. 1
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp

3
Sources/Plasma/Apps/plClient/plClient.cpp

@ -1427,7 +1427,7 @@ bool plClient::StartInit()
// //
// Init Net before loading things // Init Net before loading things
// //
plNetClientMgr::GetInstance()->Init(); plNetClientMgr::GetInstance()->RegisterAs(kNetClientMgr_KEY);
plAgeLoader::GetInstance()->Init(); plAgeLoader::GetInstance()->Init();
plCmdIfaceModMsg* pModMsg2 = new plCmdIfaceModMsg; plCmdIfaceModMsg* pModMsg2 = new plCmdIfaceModMsg;
@ -1463,6 +1463,7 @@ bool plClient::StartInit()
//============================================================================ //============================================================================
bool plClient::BeginGame() bool plClient::BeginGame()
{ {
plNetClientMgr::GetInstance()->Init();
IPlayIntroMovie("avi/CyanWorlds.webm", 0.f, 0.f, 0.f, 1.f, 1.f, 0.75); IPlayIntroMovie("avi/CyanWorlds.webm", 0.f, 0.f, 0.f, 1.f, 1.f, 0.75);
if (GetDone()) return false; if (GetDone()) return false;
IPatchGlobalAgeFiles(); IPatchGlobalAgeFiles();

1
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp

@ -341,7 +341,6 @@ int plNetClientMgr::Init()
VaultInitialize(); VaultInitialize();
RegisterAs( kNetClientMgr_KEY );
IAddCloneRoom(); IAddCloneRoom();
fNetGroups.Reset(); fNetGroups.Reset();

Loading…
Cancel
Save