OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 03:09:13 +00:00
Code Releases Activity

Some fixes to make it all compile.

Browse Source
This commit is contained in:
Michael Hansen
2013-01-07 21:56:14 -08:00
committed by Darryl Pogue
parent c448d11209
commit cb9dab2cca
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -990,7 +990,7 @@ void plClient::SetHoldLoadRequests(bool hold)
void plClient::IQueueRoomLoad(const std::vector<plLocation>& locs, bool hold) void plClient::IQueueRoomLoad(const std::vector<plLocation>& locs, bool hold)
{ {
bool allSameAge = true; bool allSameAge = true;
const char* lastAgeName = nil; plString lastAgeName;
uint32_t numRooms = 0; uint32_t numRooms = 0;
for (int i = 0; i < locs.size(); i++) for (int i = 0; i < locs.size(); i++)
@ -1016,7 +1016,7 @@ void plClient::IQueueRoomLoad(const std::vector<plLocation>& locs, bool hold)
fLoadRooms.push_back(new LoadRequest(loc, hold)); fLoadRooms.push_back(new LoadRequest(loc, hold));
if (!lastAgeName || strcmp(info->GetAge(), lastAgeName) == 0) if (lastAgeName.IsNull() || info->GetAge() == lastAgeName)
lastAgeName = info->GetAge(); lastAgeName = info->GetAge();
else else
allSameAge = false; allSameAge = false;

2
Sources/Tools/MaxComponent/plClothingComponent.cpp
View File

@ -233,7 +233,7 @@ bool plClothingComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg)
} }
const plPageInfo* thisInfo = plKeyFinder::Instance().GetLocationInfo(locationNode ? locationNode->GetLocation() : node->GetLocation()); 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++) for (i = 0; i < fCompPB->Count(plClothingComponent::kMaterials); i++)
{ {

4
Sources/Tools/MaxMain/plPluginResManager.cpp
View File

@ -120,12 +120,12 @@ plRegistryPageNode* plPluginResManager::INameToPage(const plString& age, const p
if (sequenceNumber != uint32_t(-1)) if (sequenceNumber != uint32_t(-1))
{ {
const plLocation& newLoc = ICreateLocation(age, page, sequenceNumber, itinerant); const plLocation& newLoc = ICreateLocation(age, page, sequenceNumber, itinerant);
pageNode = CreatePage(newLoc, age, page); pageNode = CreatePage(newLoc, age.c_str(), page.c_str());
} }
else else
{ {
const plLocation& newLoc = ICreateLocation(age, page, itinerant); 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 // 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 // for the shared textures page