From 34c88190c177e01c1cddd1bfddc7fe180806619d Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 25 Nov 2013 21:29:56 -0500 Subject: [PATCH] Update StartUp in initial batch ONE PATCH! This commit brings us to half of the patching goal: on launch of the client, we only show ONE "Updating..." message before we enter the game proper. Go us! --- Sources/Plasma/FeatureLib/pfPatcher/plManifests.cpp | 1 + Sources/Plasma/FeatureLib/pfPatcher/plManifests.h | 1 - .../PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp | 13 +++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Sources/Plasma/FeatureLib/pfPatcher/plManifests.cpp b/Sources/Plasma/FeatureLib/pfPatcher/plManifests.cpp index d368c2db..71a135e4 100644 --- a/Sources/Plasma/FeatureLib/pfPatcher/plManifests.cpp +++ b/Sources/Plasma/FeatureLib/pfPatcher/plManifests.cpp @@ -84,6 +84,7 @@ std::vector plManifest::EssentialGameManifests() mfs.push_back("GlobalClothing"); mfs.push_back("GlobalMarkers"); mfs.push_back("GUI"); + mfs.push_back("StartUp"); return mfs; } diff --git a/Sources/Plasma/FeatureLib/pfPatcher/plManifests.h b/Sources/Plasma/FeatureLib/pfPatcher/plManifests.h index f21d039a..c436ec23 100644 --- a/Sources/Plasma/FeatureLib/pfPatcher/plManifests.h +++ b/Sources/Plasma/FeatureLib/pfPatcher/plManifests.h @@ -67,7 +67,6 @@ namespace plManifest /** Get a vector containing all manifests the game requires to initialize. */ std::vector EssentialGameManifests(); - } #endif // _plManifests_inc_ diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp index 9d012d52..197b4e65 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp @@ -224,13 +224,18 @@ void plNCAgeJoiner::Start () { // if we're linking to startup then set the OfflineAge flag // so we by-pass the game server - if (StrLen(age.ageDatasetName) == 0 || StrCmpI(age.ageDatasetName, "StartUp") == 0) + if (StrLen(age.ageDatasetName) == 0 || StrCmpI(age.ageDatasetName, "StartUp") == 0) { nc->SetFlagsBit(plNetClientApp::kLinkingToOfflineAge); - else + + // no need to update if we're not using a GameSrv + plgDispatch::MsgSend(new plResPatcherMsg()); + } else { nc->SetFlagsBit(plNetClientApp::kLinkingToOfflineAge, false); - plAgeLoader* al = plAgeLoader::GetInstance(); - al->UpdateAge(age.ageDatasetName); + // we only need to update the age if we're using a GameSrv + plAgeLoader* al = plAgeLoader::GetInstance(); + al->UpdateAge(age.ageDatasetName); + } } //============================================================================