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

Merge pull request #251 from dpogue/plresmgr-strings

Browse Source 
Convert plRegistryNode stuff to plString.
This commit is contained in:
Michael Hansen
2013-01-07 21:59:09 -08:00
parent 3bfb6b5850 cb9dab2cca
commit 2eb3648144
22 changed files with 116 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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)
{
bool allSameAge = true;
const char* lastAgeName = nil;
plString lastAgeName;
uint32_t numRooms = 0;
for (int i = 0; i < locs.size(); i++)
@ -1006,9 +1006,9 @@ void plClient::IQueueRoomLoad(const std::vector<plLocation>& locs, bool hold)
if (!info)
hsStatusMessageF("Ignoring LoadRoom request for location 0x%x because we can't find the location", loc.GetSequenceNumber());
else if (alreadyLoaded)
hsStatusMessageF("Ignoring LoadRoom request for %s-%s, since room is already loaded", info->GetAge(), info->GetPage());
hsStatusMessageF("Ignoring LoadRoom request for %s-%s, since room is already loaded", info->GetAge().c_str(), info->GetPage().c_str());
else if (isLoading)
hsStatusMessageF("Ignoring LoadRoom request for %s-%s, since room is currently loading", info->GetAge(), info->GetPage());
hsStatusMessageF("Ignoring LoadRoom request for %s-%s, since room is currently loading", info->GetAge().c_str(), info->GetPage().c_str());
#endif
continue;
@ -1016,7 +1016,7 @@ void plClient::IQueueRoomLoad(const std::vector<plLocation>& 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;

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

@ -95,7 +95,7 @@ int PrintHelp( void )
int main(int argc, char* argv[])
{
if (argc >= 1 && strcmp(argv[1], "-v") == 0)
if (argc >= 2 && strcmp(argv[1], "-v") == 0)
{
PrintVersion();
return 0;
@ -249,7 +249,7 @@ public:
const plPageInfo& info = page->GetPageInfo();
char fileName[256];
sprintf(fileName, "%s%s_%s.csv", fOutputDir, info.GetAge(), info.GetPage());
sprintf(fileName, "%s%s_%s.csv", fOutputDir, info.GetAge().c_str(), info.GetPage().c_str());
fStream.Open(fileName, "wt");
page->LoadKeys();