diff --git a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp index 5e1257c4..b132a453 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp +++ b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp @@ -1632,7 +1632,7 @@ void plVirtualCam1::PushCamera(plCameraModifier1* pCam, hsBool bDefault) StartTransition(pTrans); delete(pTrans); #ifdef STATUS_LOG - camLog->AddLineF("Performing stock track transition between %s and %s",fPrevCam->GetKeyName(), pCam->GetKeyName()); + camLog->AddLineF("Performing stock track transition between %s and %s",fPrevCam->GetKeyName().c_str(), pCam->GetKeyName().c_str()); #endif } else @@ -1645,7 +1645,7 @@ void plVirtualCam1::PushCamera(plCameraModifier1* pCam, hsBool bDefault) StartTransition(pTrans); delete(pTrans); #ifdef STATUS_LOG - camLog->AddLineF("Performing stock cut transition between %s and %s",fPrevCam->GetKeyName(), pCam->GetKeyName()); + camLog->AddLineF("Performing stock cut transition between %s and %s",fPrevCam->GetKeyName().c_str(), pCam->GetKeyName().c_str()); #endif } } @@ -1656,7 +1656,7 @@ void plVirtualCam1::PushCamera(plCameraModifier1* pCam, hsBool bDefault) AddCameraToStack(pCam); StartTransition(pTrans); #ifdef STATUS_LOG - camLog->AddLineF("Performing custom transition between %s and %s",fPrevCam->GetKeyName(), pCam->GetKeyName()); + camLog->AddLineF("Performing custom transition between %s and %s",fPrevCam->GetKeyName().c_str(), pCam->GetKeyName().c_str()); #endif } @@ -1666,7 +1666,7 @@ void plVirtualCam1::PushCamera(plCameraModifier1* pCam, hsBool bDefault) // just push it on, since we have a python camera present. AddCameraToStack(pCam); #ifdef STATUS_LOG - camLog->AddLineF("No transition between %s and %s, python camera is currently displaying",fPrevCam->GetKeyName(), pCam->GetKeyName()); + camLog->AddLineF("No transition between %s and %s, python camera is currently displaying",fPrevCam->GetKeyName().c_str(), pCam->GetKeyName().c_str()); #endif } // make this the default camera if that's what we want... @@ -1675,7 +1675,7 @@ void plVirtualCam1::PushCamera(plCameraModifier1* pCam, hsBool bDefault) fCameraStack.SetCountAndZero(0); AddCameraToStack(pCam); #ifdef STATUS_LOG - camLog->AddLineF("Camera %s is now the DEFAULT camera for this age", pCam->GetKeyName()); + camLog->AddLineF("Camera %s is now the DEFAULT camera for this age", pCam->GetKeyName().c_str()); #endif } SetFOV(GetCurrentStackCamera()->GetFOVw(), GetCurrentStackCamera()->GetFOVh(), GetCurrentStackCamera()); @@ -1861,7 +1861,7 @@ void plVirtualCam1::StartTransition(CamTrans* transition) #ifdef STATUS_LOG if (fPrevCam->GetKey() && pCam->GetKey()) - camLog->AddLineF("Starting Camera Transition from %s to %s",fPrevCam->GetKeyName(), pCam->GetKeyName()); + camLog->AddLineF("Starting Camera Transition from %s to %s",fPrevCam->GetKeyName().c_str(), pCam->GetKeyName().c_str()); #endif if ( (fPythonOverride && plCameraBrain1_Avatar::ConvertNoRef(fPythonOverride->GetBrain())) || @@ -2066,16 +2066,16 @@ void plVirtualCam1::IHandleCameraStatusLog(plCameraModifier1* pMod, int action) switch(action) { case kPop: - camLog->AddLineF("Popped Camera %s from top of stack", pMod->GetKeyName()); + camLog->AddLineF("Popped Camera %s from top of stack", pMod->GetKeyName().c_str()); break; case kBackgroundPop: - camLog->AddLineF("Popped Camera %s from background", pMod->GetKeyName()); + camLog->AddLineF("Popped Camera %s from background", pMod->GetKeyName().c_str()); break; case kPush: - camLog->AddLineF("Pushed Camera %s", pMod->GetKeyName()); + camLog->AddLineF("Pushed Camera %s", pMod->GetKeyName().c_str()); break; case kReplacement: - camLog->AddLineF("Camera %s replacing popped camera", pMod->GetKeyName()); + camLog->AddLineF("Camera %s replacing popped camera", pMod->GetKeyName().c_str()); break; } if (pBrain) diff --git a/Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp b/Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp index 52e10efe..61ad646f 100644 --- a/Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp +++ b/Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp @@ -299,7 +299,7 @@ void plWinAudible::SynchedPlay(int index) void plWinAudible::Play(int index ) { - // hsStatusMessageF( "Playing sound %s, index %d, time=%f\n", GetKeyName(), index, hsTimer::GetSeconds()); + // hsStatusMessageF( "Playing sound %s, index %d, time=%f\n", GetKeyName().c_str(), index, hsTimer::GetSeconds()); SND_APPLY_LOOP( index, Play(), ; ); } diff --git a/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp b/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp index 4011462e..213a0d09 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp @@ -140,10 +140,10 @@ void plSound::IPrintDbgMessage( const char *msg, hsBool isError ) } if( isError ) -// ourLog->AddLineF( plStatusLog::kRed, "ERROR: %s (%s)", msg, GetKey() ? GetKeyName() : "unkeyed" ); +// ourLog->AddLineF( plStatusLog::kRed, "ERROR: %s (%s)", msg, GetKey() ? GetKeyName().c_str() : "unkeyed" ); ourLog->AddLineS( "audio.log", plStatusLog::kRed, "ERROR: %s (%s)", msg, GetKey() ? GetKeyName().c_str() : "unkeyed" ); else -// ourLog->AddLineF( "%s (%s)", msg, GetKey() ? GetKeyName() : "unkeyed" ); +// ourLog->AddLineF( "%s (%s)", msg, GetKey() ? GetKeyName().c_str() : "unkeyed" ); ourLog->AddLineS( "audio.log", "%s (%s)", msg, GetKey() ? GetKeyName().c_str() : "unkeyed" ); } diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp index dd25ac55..626329aa 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp @@ -141,7 +141,7 @@ bool plAvLadderMod::IIsReadyToClimb() } else if (movingForward) { -// DetectorLog("%s: Ladder rejecting climb (%f)", GetKeyName(), hsRadiansToDegrees(acos(dot))); +// DetectorLog("%s: Ladder rejecting climb (%f)", GetKeyName().c_str(), hsRadiansToDegrees(acos(dot))); return false; } } diff --git a/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp index 37298b40..c489acda 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp @@ -143,14 +143,14 @@ hsBool plExcludeRegionModifier::MsgReceive(plMessage* msg) { if (exclMsg->GetCmd() == plExcludeRegionMsg::kClear) { - DetectorLogSpecial("Clearing exclude region %s", GetKeyName()); + DetectorLogSpecial("Clearing exclude region %s", GetKeyName().c_str()); IMoveAvatars(); fContainedAvatars.Reset(); ISetPhysicalState(true); } else if (exclMsg->GetCmd() == plExcludeRegionMsg::kRelease) { - DetectorLogSpecial("Releasing exclude region %s", GetKeyName()); + DetectorLogSpecial("Releasing exclude region %s", GetKeyName().c_str()); ISetPhysicalState(false); } @@ -167,12 +167,12 @@ hsBool plExcludeRegionModifier::MsgReceive(plMessage* msg) { if (collideMsg->fEntering) { - //DetectorLogSpecial("Avatar enter exclude region %s",GetKeyName()); + //DetectorLogSpecial("Avatar enter exclude region %s",GetKeyName().c_str()); fContainedAvatars.Append(collideMsg->fOtherKey); } else { - //DetectorLogSpecial("Avatar exit exclude region %s",GetKeyName()); + //DetectorLogSpecial("Avatar exit exclude region %s",GetKeyName().c_str()); int idx = fContainedAvatars.Find(collideMsg->fOtherKey); if (idx != fContainedAvatars.kMissingIndex) fContainedAvatars.Remove(idx); @@ -397,7 +397,7 @@ void plExcludeRegionSDLModifier::ISetCurrentStateFrom(const plStateDataRecord* s bool cleared; var->Get(&cleared); - DetectorLogSpecial("SDL %s exclude region %s", cleared ? "clearing" : "releasing", fXRegion->GetKeyName()); + DetectorLogSpecial("SDL %s exclude region %s", cleared ? "clearing" : "releasing", fXRegion->GetKeyName().c_str()); fXRegion->ISetPhysicalState(cleared); } } diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.cpp index f388555c..8ff03da7 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.cpp @@ -141,7 +141,7 @@ void plPhysicalSDLModifier::ISentState(const plStateDataRecord* sentState) // plPhysical* phys = IGetPhysical(); // if (!phys->GetBody()->isActive()) -// IGetLog()->AddLineF("Phys %s sent state because it deactivated", phys->GetKeyName()); +// IGetLog()->AddLineF("Phys %s sent state because it deactivated", phys->GetKeyName().c_str()); } }