mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-14 02:27:40 -04:00
These got missed...
This commit is contained in:
@ -1632,7 +1632,7 @@ void plVirtualCam1::PushCamera(plCameraModifier1* pCam, hsBool bDefault)
|
|||||||
StartTransition(pTrans);
|
StartTransition(pTrans);
|
||||||
delete(pTrans);
|
delete(pTrans);
|
||||||
#ifdef STATUS_LOG
|
#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
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -1645,7 +1645,7 @@ void plVirtualCam1::PushCamera(plCameraModifier1* pCam, hsBool bDefault)
|
|||||||
StartTransition(pTrans);
|
StartTransition(pTrans);
|
||||||
delete(pTrans);
|
delete(pTrans);
|
||||||
#ifdef STATUS_LOG
|
#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
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1656,7 +1656,7 @@ void plVirtualCam1::PushCamera(plCameraModifier1* pCam, hsBool bDefault)
|
|||||||
AddCameraToStack(pCam);
|
AddCameraToStack(pCam);
|
||||||
StartTransition(pTrans);
|
StartTransition(pTrans);
|
||||||
#ifdef STATUS_LOG
|
#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
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1666,7 +1666,7 @@ void plVirtualCam1::PushCamera(plCameraModifier1* pCam, hsBool bDefault)
|
|||||||
// just push it on, since we have a python camera present.
|
// just push it on, since we have a python camera present.
|
||||||
AddCameraToStack(pCam);
|
AddCameraToStack(pCam);
|
||||||
#ifdef STATUS_LOG
|
#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
|
#endif
|
||||||
}
|
}
|
||||||
// make this the default camera if that's what we want...
|
// 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);
|
fCameraStack.SetCountAndZero(0);
|
||||||
AddCameraToStack(pCam);
|
AddCameraToStack(pCam);
|
||||||
#ifdef STATUS_LOG
|
#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
|
#endif
|
||||||
}
|
}
|
||||||
SetFOV(GetCurrentStackCamera()->GetFOVw(), GetCurrentStackCamera()->GetFOVh(), GetCurrentStackCamera());
|
SetFOV(GetCurrentStackCamera()->GetFOVw(), GetCurrentStackCamera()->GetFOVh(), GetCurrentStackCamera());
|
||||||
@ -1861,7 +1861,7 @@ void plVirtualCam1::StartTransition(CamTrans* transition)
|
|||||||
|
|
||||||
#ifdef STATUS_LOG
|
#ifdef STATUS_LOG
|
||||||
if (fPrevCam->GetKey() && pCam->GetKey())
|
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
|
#endif
|
||||||
|
|
||||||
if ( (fPythonOverride && plCameraBrain1_Avatar::ConvertNoRef(fPythonOverride->GetBrain())) ||
|
if ( (fPythonOverride && plCameraBrain1_Avatar::ConvertNoRef(fPythonOverride->GetBrain())) ||
|
||||||
@ -2066,16 +2066,16 @@ void plVirtualCam1::IHandleCameraStatusLog(plCameraModifier1* pMod, int action)
|
|||||||
switch(action)
|
switch(action)
|
||||||
{
|
{
|
||||||
case kPop:
|
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;
|
break;
|
||||||
case kBackgroundPop:
|
case kBackgroundPop:
|
||||||
camLog->AddLineF("Popped Camera %s from background", pMod->GetKeyName());
|
camLog->AddLineF("Popped Camera %s from background", pMod->GetKeyName().c_str());
|
||||||
break;
|
break;
|
||||||
case kPush:
|
case kPush:
|
||||||
camLog->AddLineF("Pushed Camera %s", pMod->GetKeyName());
|
camLog->AddLineF("Pushed Camera %s", pMod->GetKeyName().c_str());
|
||||||
break;
|
break;
|
||||||
case kReplacement:
|
case kReplacement:
|
||||||
camLog->AddLineF("Camera %s replacing popped camera", pMod->GetKeyName());
|
camLog->AddLineF("Camera %s replacing popped camera", pMod->GetKeyName().c_str());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (pBrain)
|
if (pBrain)
|
||||||
|
@ -299,7 +299,7 @@ void plWinAudible::SynchedPlay(int index)
|
|||||||
|
|
||||||
void plWinAudible::Play(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(), ; );
|
SND_APPLY_LOOP( index, Play(), ; );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -140,10 +140,10 @@ void plSound::IPrintDbgMessage( const char *msg, hsBool isError )
|
|||||||
}
|
}
|
||||||
|
|
||||||
if( 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" );
|
ourLog->AddLineS( "audio.log", plStatusLog::kRed, "ERROR: %s (%s)", msg, GetKey() ? GetKeyName().c_str() : "unkeyed" );
|
||||||
else
|
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" );
|
ourLog->AddLineS( "audio.log", "%s (%s)", msg, GetKey() ? GetKeyName().c_str() : "unkeyed" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -141,7 +141,7 @@ bool plAvLadderMod::IIsReadyToClimb()
|
|||||||
}
|
}
|
||||||
else if (movingForward)
|
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;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -143,14 +143,14 @@ hsBool plExcludeRegionModifier::MsgReceive(plMessage* msg)
|
|||||||
{
|
{
|
||||||
if (exclMsg->GetCmd() == plExcludeRegionMsg::kClear)
|
if (exclMsg->GetCmd() == plExcludeRegionMsg::kClear)
|
||||||
{
|
{
|
||||||
DetectorLogSpecial("Clearing exclude region %s", GetKeyName());
|
DetectorLogSpecial("Clearing exclude region %s", GetKeyName().c_str());
|
||||||
IMoveAvatars();
|
IMoveAvatars();
|
||||||
fContainedAvatars.Reset();
|
fContainedAvatars.Reset();
|
||||||
ISetPhysicalState(true);
|
ISetPhysicalState(true);
|
||||||
}
|
}
|
||||||
else if (exclMsg->GetCmd() == plExcludeRegionMsg::kRelease)
|
else if (exclMsg->GetCmd() == plExcludeRegionMsg::kRelease)
|
||||||
{
|
{
|
||||||
DetectorLogSpecial("Releasing exclude region %s", GetKeyName());
|
DetectorLogSpecial("Releasing exclude region %s", GetKeyName().c_str());
|
||||||
ISetPhysicalState(false);
|
ISetPhysicalState(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -167,12 +167,12 @@ hsBool plExcludeRegionModifier::MsgReceive(plMessage* msg)
|
|||||||
{
|
{
|
||||||
if (collideMsg->fEntering)
|
if (collideMsg->fEntering)
|
||||||
{
|
{
|
||||||
//DetectorLogSpecial("Avatar enter exclude region %s",GetKeyName());
|
//DetectorLogSpecial("Avatar enter exclude region %s",GetKeyName().c_str());
|
||||||
fContainedAvatars.Append(collideMsg->fOtherKey);
|
fContainedAvatars.Append(collideMsg->fOtherKey);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//DetectorLogSpecial("Avatar exit exclude region %s",GetKeyName());
|
//DetectorLogSpecial("Avatar exit exclude region %s",GetKeyName().c_str());
|
||||||
int idx = fContainedAvatars.Find(collideMsg->fOtherKey);
|
int idx = fContainedAvatars.Find(collideMsg->fOtherKey);
|
||||||
if (idx != fContainedAvatars.kMissingIndex)
|
if (idx != fContainedAvatars.kMissingIndex)
|
||||||
fContainedAvatars.Remove(idx);
|
fContainedAvatars.Remove(idx);
|
||||||
@ -397,7 +397,7 @@ void plExcludeRegionSDLModifier::ISetCurrentStateFrom(const plStateDataRecord* s
|
|||||||
bool cleared;
|
bool cleared;
|
||||||
var->Get(&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);
|
fXRegion->ISetPhysicalState(cleared);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -141,7 +141,7 @@ void plPhysicalSDLModifier::ISentState(const plStateDataRecord* sentState)
|
|||||||
|
|
||||||
// plPhysical* phys = IGetPhysical();
|
// plPhysical* phys = IGetPhysical();
|
||||||
// if (!phys->GetBody()->isActive())
|
// 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());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user