OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 10:52:46 +00:00
Code Releases Activity

Revert "Fix black screen introduced by #507"

Browse Source 
This reverts commit 29792b92d1.
This commit is contained in:
Adam Johnson
2015-08-02 16:14:32 -04:00
parent 29792b92d1
commit 131d26f1cd
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Sources/Plasma/Apps/plClient/plClient.cpp
View File

@ -812,9 +812,10 @@ bool plClient::MsgReceive(plMessage* msg)
//============================================================================ //============================================================================
if (plNetCommAuthMsg* authMsg = plNetCommAuthMsg::ConvertNoRef(msg)) { if (plNetCommAuthMsg* authMsg = plNetCommAuthMsg::ConvertNoRef(msg)) {
plgDispatch::Dispatch()->UnRegisterForExactType(plNetCommAuthMsg::Index(), GetKey()); plgDispatch::Dispatch()->UnRegisterForExactType(plNetCommAuthMsg::Index(), GetKey());
if (IS_NET_SUCCESS(authMsg->result)) if (IS_NET_SUCCESS(authMsg->result)) {
SetFlag(kFlagInitialAuthComplete);
IPatchGlobalAgeFiles(); IPatchGlobalAgeFiles();
return true; }
} }
return hsKeyedObject::MsgReceive(msg); return hsKeyedObject::MsgReceive(msg);
@ -1476,24 +1477,21 @@ bool plClient::BeginGame()
{ {
plNetClientMgr::GetInstance()->Init(); 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);
SetFlag(kFlagIntroComplete);
if (GetDone()) return false; if (GetDone()) return false;
if (NetCommGetStartupAge()->ageDatasetName.CompareI("StartUp") == 0) { IPatchGlobalAgeFiles();
// This is needed because there is no auth step in this case
plNetCommAuthMsg* msg = new plNetCommAuthMsg();
msg->result = kNetSuccess;
msg->param = nullptr;
msg->Send();
}
return true; return true;
} }
//============================================================================ //============================================================================
void plClient::IPatchGlobalAgeFiles( void ) void plClient::IPatchGlobalAgeFiles( void )
{ {
plgDispatch::Dispatch()->RegisterForExactType(plResPatcherMsg::Index(), GetKey()); if (HasFlag(kFlagIntroComplete) && HasFlag(kFlagInitialAuthComplete)) {
plgDispatch::Dispatch()->RegisterForExactType(plResPatcherMsg::Index(), GetKey());
plResPatcher* patcher = plResPatcher::GetInstance(); plResPatcher* patcher = plResPatcher::GetInstance();
patcher->Update(plManifest::EssentialGameManifests()); patcher->Update(plManifest::EssentialGameManifests());
}
} }
void plClient::InitDLLs() void plClient::InitDLLs()

2
Sources/Plasma/Apps/plClient/plClient.h
View File

@ -248,6 +248,8 @@ public:
kFlagDBGDisableRRequests, kFlagDBGDisableRRequests,
kFlagAsyncInitComplete, kFlagAsyncInitComplete,
kFlagGlobalDataLoaded, kFlagGlobalDataLoaded,
kFlagInitialAuthComplete,
kFlagIntroComplete,
}; };
bool HasFlag(int f) const { return fFlags.IsBitSet(f); } bool HasFlag(int f) const { return fFlags.IsBitSet(f); }