From cb9dab2ccac52ba3c60844751d27a79981ee85f1 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Mon, 7 Jan 2013 21:56:14 -0800 Subject: [PATCH] Some fixes to make it all compile. --- Sources/Plasma/Apps/plClient/plClient.cpp | 4 ++-- Sources/Tools/MaxComponent/plClothingComponent.cpp | 2 +- Sources/Tools/MaxMain/plPluginResManager.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Sources/Plasma/Apps/plClient/plClient.cpp b/Sources/Plasma/Apps/plClient/plClient.cpp index b0e895d5..a1dc8e5c 100644 --- a/Sources/Plasma/Apps/plClient/plClient.cpp +++ b/Sources/Plasma/Apps/plClient/plClient.cpp @@ -990,7 +990,7 @@ void plClient::SetHoldLoadRequests(bool hold) void plClient::IQueueRoomLoad(const std::vector& locs, bool hold) { bool allSameAge = true; - const char* lastAgeName = nil; + plString lastAgeName; uint32_t numRooms = 0; for (int i = 0; i < locs.size(); i++) @@ -1016,7 +1016,7 @@ void plClient::IQueueRoomLoad(const std::vector& locs, bool hold) fLoadRooms.push_back(new LoadRequest(loc, hold)); - if (!lastAgeName || strcmp(info->GetAge(), lastAgeName) == 0) + if (lastAgeName.IsNull() || info->GetAge() == lastAgeName) lastAgeName = info->GetAge(); else allSameAge = false; diff --git a/Sources/Tools/MaxComponent/plClothingComponent.cpp b/Sources/Tools/MaxComponent/plClothingComponent.cpp index a9d30419..f8552b6a 100644 --- a/Sources/Tools/MaxComponent/plClothingComponent.cpp +++ b/Sources/Tools/MaxComponent/plClothingComponent.cpp @@ -233,7 +233,7 @@ bool plClothingComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg) } const plPageInfo* thisInfo = plKeyFinder::Instance().GetLocationInfo(locationNode ? locationNode->GetLocation() : node->GetLocation()); - const plLocation &loc = plKeyFinder::Instance().FindLocation("GlobalClothing", thisInfo->GetPage()); + const plLocation &loc = plKeyFinder::Instance().FindLocation("GlobalClothing", thisInfo->GetPage().c_str()); for (i = 0; i < fCompPB->Count(plClothingComponent::kMaterials); i++) { diff --git a/Sources/Tools/MaxMain/plPluginResManager.cpp b/Sources/Tools/MaxMain/plPluginResManager.cpp index d6f9281d..596ef6e1 100644 --- a/Sources/Tools/MaxMain/plPluginResManager.cpp +++ b/Sources/Tools/MaxMain/plPluginResManager.cpp @@ -120,12 +120,12 @@ plRegistryPageNode* plPluginResManager::INameToPage(const plString& age, const p if (sequenceNumber != uint32_t(-1)) { const plLocation& newLoc = ICreateLocation(age, page, sequenceNumber, itinerant); - pageNode = CreatePage(newLoc, age, page); + pageNode = CreatePage(newLoc, age.c_str(), page.c_str()); } else { const plLocation& newLoc = ICreateLocation(age, page, itinerant); - pageNode = CreatePage(newLoc, age, page); + pageNode = CreatePage(newLoc, age.c_str(), page.c_str()); } // Still preload textures on this guy. This should be a no-op for this page since it's new, but won't be // for the shared textures page