OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 10:37:41 -04:00
Code Releases Activity

These got missed...

Browse Source
This commit is contained in:
Adam Johnson
2012-02-18 02:49:55 -05:00
parent 85136f8050
commit 0f68e5ae13
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp
View File

@ -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)

2
Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp
View File

@ -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(), ; );
}

4
Sources/Plasma/PubUtilLib/plAudio/plSound.cpp
View File

@ -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" );
}

2
Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp
View File

@ -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;
}
}

10
Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp
View File

@ -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);
}
}

2
Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.cpp
View File

@ -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());
}
}