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

Convert plUoid's object name to a plString

Browse Source
This commit is contained in:
Michael Hansen
2012-01-28 16:24:20 -08:00
parent 442a733fbb
commit e34414889f
122 changed files with 810 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp
View File

@ -81,7 +81,7 @@ protected:
plStringList fAges;
int fNextAge;
int fNextSpawnPoint;
const char* fLastSpawnPointName;
plString fLastSpawnPointName;
// For profiling a single age
std::string fAgeName;
bool fLinkedToSingleAge;
@ -89,7 +89,7 @@ protected:
UInt64 fLinkTime;
std::string fStatusMessage;
plString fStatusMessage;
void INextProfile();
bool INextAge();
@ -115,7 +115,7 @@ plAutoProfile* plAutoProfile::Instance()
////////////////////////////////////////////////////////////////////////////////
plAutoProfileImp::plAutoProfileImp() : fNextAge(0), fNextSpawnPoint(0), fLastSpawnPointName(nil), fLinkedToSingleAge(false), fJustLinkToAges(false)
plAutoProfileImp::plAutoProfileImp() : fNextAge(0), fNextSpawnPoint(0), fLinkedToSingleAge(false), fJustLinkToAges(false)
{
}
@ -216,10 +216,10 @@ void plAutoProfileImp::INextProfile()
else
{
// Log the stats for this spawn point
if (fLastSpawnPointName)
if (!fLastSpawnPointName.IsNull())
{
const char * ageName = NetCommGetAge()->ageDatasetName;
plProfileManagerFull::Instance().LogStats(ageName, fLastSpawnPointName);
plProfileManagerFull::Instance().LogStats(ageName, _TEMP_CONVERT_TO_CONST_CHAR(fLastSpawnPointName));
plMipmap mipmap;
if (plClient::GetInstance()->GetPipeline()->CaptureScreen(&mipmap))
@ -233,7 +233,7 @@ void plAutoProfileImp::INextProfile()
plJPEG::Instance().WriteToFile(fileName, &mipmap);
}
fLastSpawnPointName = nil;
fLastSpawnPointName = plString::Null;
}
// Try to go to the next spawn point
@ -277,8 +277,8 @@ bool plAutoProfileImp::INextAge()
link.SetLinkingRules(plNetCommon::LinkingRules::kBasicLink);
plNetLinkingMgr::GetInstance()->LinkToAge(&link);
fStatusMessage = "Linking to age ";
fStatusMessage += ageName;
fStatusMessage = _TEMP_CONVERT_FROM_LITERAL("Linking to age ");
fStatusMessage += _TEMP_CONVERT_FROM_LITERAL(ageName);
return true;
}
@ -298,9 +298,9 @@ bool plAutoProfileImp::INextSpawnPoint()
const plSpawnModifier* spawnMod = plAvatarMgr::GetInstance()->GetSpawnPoint(fNextSpawnPoint);
fLastSpawnPointName = spawnMod->GetKeyName();
if (strncmp(fLastSpawnPointName, kPerfSpawnPrefix, kPerfSpawnLen) == 0)
if (fLastSpawnPointName.CompareN(kPerfSpawnPrefix, kPerfSpawnLen) == 0)
{
fStatusMessage = "Profiling spawn point ";
fStatusMessage = _TEMP_CONVERT_FROM_LITERAL("Profiling spawn point ");
fStatusMessage += fLastSpawnPointName;
foundGood = true;
@ -312,8 +312,8 @@ bool plAutoProfileImp::INextSpawnPoint()
if (!foundGood)
{
fLastSpawnPointName = nil;
fStatusMessage = "No profile spawn point found";
fLastSpawnPointName = plString::Null;
fStatusMessage = _TEMP_CONVERT_FROM_LITERAL("No profile spawn point found");
return false;
}
@ -337,7 +337,7 @@ hsBool plAutoProfileImp::MsgReceive(plMessage* msg)
plEvalMsg* evalMsg = plEvalMsg::ConvertNoRef(msg);
if (evalMsg)
{
if (fStatusMessage.length() > 0)
if (fStatusMessage.GetSize() > 0)
plDebugText::Instance().DrawString(10, 10, fStatusMessage.c_str());
}
@ -369,7 +369,7 @@ hsBool plAutoProfileImp::MsgReceive(plMessage* msg)
ms);
}
fStatusMessage = "Age loaded. Preparing to profile.";
fStatusMessage = _TEMP_CONVERT_FROM_LITERAL("Age loaded. Preparing to profile.");
// Age is loaded, start profiling in 5 seconds (to make sure the avatar is linked in all the way)
plTimerCallbackMsg* timerMsg = TRACKED_NEW plTimerCallbackMsg(GetKey());