mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-20 04:09:16 +00:00
Obliterate hsBool
This commit is contained in:
@ -89,7 +89,7 @@ void MakeMatrixUpright(hsMatrix44 &mat);
|
||||
#define kDefaultMaxSidleRange 4.0f
|
||||
#define kDefaultMaxSidleAngle 0.2f
|
||||
|
||||
hsBool plAvTaskSeek::fLogProcess = false;
|
||||
bool plAvTaskSeek::fLogProcess = false;
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
@ -203,7 +203,7 @@ void plAvTaskSeek::SetTarget(hsPoint3 &pos, hsPoint3 &lookAt)
|
||||
|
||||
// Start -----------------------------------------------------------------------------------------
|
||||
// ------
|
||||
hsBool plAvTaskSeek::Start(plArmatureMod *avatar, plArmatureBrain *brain, double time, float elapsed)
|
||||
bool plAvTaskSeek::Start(plArmatureMod *avatar, plArmatureBrain *brain, double time, float elapsed)
|
||||
{
|
||||
plAvBrainHuman *huBrain = plAvBrainHuman::ConvertNoRef(brain);
|
||||
hsAssert(huBrain, "Seek task only works on human brains");
|
||||
@ -243,7 +243,7 @@ hsBool plAvTaskSeek::Start(plArmatureMod *avatar, plArmatureBrain *brain, double
|
||||
|
||||
// Process -------------------------------------------------------------------------------------------
|
||||
// --------
|
||||
hsBool plAvTaskSeek::Process(plArmatureMod *avatar, plArmatureBrain *brain, double time, float elapsed)
|
||||
bool plAvTaskSeek::Process(plArmatureMod *avatar, plArmatureBrain *brain, double time, float elapsed)
|
||||
{
|
||||
if (fState == kSeekAbort)
|
||||
return false;
|
||||
@ -257,7 +257,7 @@ hsBool plAvTaskSeek::Process(plArmatureMod *avatar, plArmatureBrain *brain, doub
|
||||
}
|
||||
|
||||
IAnalyze(avatar);
|
||||
hsBool result = IMoveTowardsGoal(avatar, uBrain, time, elapsed);
|
||||
bool result = IMoveTowardsGoal(avatar, uBrain, time, elapsed);
|
||||
if (fLogProcess)
|
||||
DumpToAvatarLog(avatar);
|
||||
return result;
|
||||
@ -311,7 +311,7 @@ void plAvTaskSeek::LeaveAge(plArmatureMod *avatar)
|
||||
|
||||
// IAnalyze ----------------------------------------
|
||||
// ---------
|
||||
hsBool plAvTaskSeek::IAnalyze(plArmatureMod *avatar)
|
||||
bool plAvTaskSeek::IAnalyze(plArmatureMod *avatar)
|
||||
{
|
||||
avatar->GetPositionAndRotationSim(&fPosition, &fRotation);
|
||||
hsScalarTriple tmp(fSeekPos - fPosition);
|
||||
@ -350,7 +350,7 @@ hsBool plAvTaskSeek::IAnalyze(plArmatureMod *avatar)
|
||||
|
||||
// IMoveTowardsGoal --------------------------------------------------------------
|
||||
// -----------------
|
||||
hsBool plAvTaskSeek::IMoveTowardsGoal(plArmatureMod *avatar, plAvBrainHuman *brain,
|
||||
bool plAvTaskSeek::IMoveTowardsGoal(plArmatureMod *avatar, plAvBrainHuman *brain,
|
||||
double time, float elapsed)
|
||||
{
|
||||
bool stillRunning = true;
|
||||
@ -438,7 +438,7 @@ hsBool plAvTaskSeek::IMoveTowardsGoal(plArmatureMod *avatar, plAvBrainHuman *bra
|
||||
// ITRYFINISH
|
||||
bool plAvTaskSeek::ITryFinish(plArmatureMod *avatar, plAvBrainHuman *brain, double time, float elapsed)
|
||||
{
|
||||
hsBool animsDone = brain->IsMovementZeroBlend();
|
||||
bool animsDone = brain->IsMovementZeroBlend();
|
||||
|
||||
hsPoint3 newPosition = fPosition;
|
||||
hsQuat newRotation = fRotation;
|
||||
@ -457,7 +457,7 @@ bool plAvTaskSeek::ITryFinish(plArmatureMod *avatar, plAvBrainHuman *brain, doub
|
||||
return fStillPositioning || fStillRotating || !animsDone;
|
||||
}
|
||||
|
||||
hsBool plAvTaskSeek::IFinishPosition(hsPoint3 &newPosition,
|
||||
bool plAvTaskSeek::IFinishPosition(hsPoint3 &newPosition,
|
||||
plArmatureMod *avatar, plAvBrainHuman *brain,
|
||||
double time, float elapsed)
|
||||
{
|
||||
@ -493,7 +493,7 @@ hsBool plAvTaskSeek::IFinishPosition(hsPoint3 &newPosition,
|
||||
|
||||
// IFinishRotation --------------------------------------
|
||||
// ----------------
|
||||
hsBool plAvTaskSeek::IFinishRotation(hsQuat &newRotation,
|
||||
bool plAvTaskSeek::IFinishRotation(hsQuat &newRotation,
|
||||
plArmatureMod *avatar, plAvBrainHuman *brain,
|
||||
double time, float elapsed)
|
||||
{
|
||||
@ -504,7 +504,7 @@ hsBool plAvTaskSeek::IFinishRotation(hsQuat &newRotation,
|
||||
|
||||
// IUpdateObjective ----------------------------------------
|
||||
// -----------------
|
||||
hsBool plAvTaskSeek::IUpdateObjective(plArmatureMod *avatar)
|
||||
bool plAvTaskSeek::IUpdateObjective(plArmatureMod *avatar)
|
||||
{
|
||||
// This is an entirely valid case. It just means our goal is fixed.
|
||||
if (fSeekObject == nil)
|
||||
|
Reference in New Issue
Block a user