From 697fbdabf10d956e0f13bfbc9414d3db40f0c535 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 10 Jun 2012 15:28:12 +0200 Subject: BOOL -> bool; additional fixes in constructors/destructors --- src/object/task/task.cpp | 12 +-- src/object/task/task.h | 6 +- src/object/task/taskadvance.cpp | 15 ++- src/object/task/taskadvance.h | 4 +- src/object/task/taskbuild.cpp | 80 +++++++------- src/object/task/taskbuild.h | 12 +-- src/object/task/taskfire.cpp | 27 +++-- src/object/task/taskfire.h | 10 +- src/object/task/taskfireant.cpp | 28 +++-- src/object/task/taskfireant.h | 8 +- src/object/task/taskflag.cpp | 19 ++-- src/object/task/taskflag.h | 6 +- src/object/task/taskgoto.cpp | 204 ++++++++++++++++++------------------ src/object/task/taskgoto.h | 26 ++--- src/object/task/taskgungoal.cpp | 15 ++- src/object/task/taskgungoal.h | 4 +- src/object/task/taskinfo.cpp | 21 ++-- src/object/task/taskinfo.h | 8 +- src/object/task/taskmanager.cpp | 22 ++-- src/object/task/taskmanager.h | 14 +-- src/object/task/taskmanip.cpp | 108 ++++++++++--------- src/object/task/taskmanip.h | 24 ++--- src/object/task/taskpen.cpp | 23 ++-- src/object/task/taskpen.h | 8 +- src/object/task/taskrecover.cpp | 40 ++++--- src/object/task/taskrecover.h | 6 +- src/object/task/taskreset.cpp | 31 +++--- src/object/task/taskreset.h | 6 +- src/object/task/tasksearch.cpp | 38 ++++--- src/object/task/tasksearch.h | 8 +- src/object/task/taskshield.cpp | 36 +++---- src/object/task/taskshield.h | 10 +- src/object/task/taskspiderexplo.cpp | 22 ++-- src/object/task/taskspiderexplo.h | 6 +- src/object/task/tasktake.cpp | 58 +++++----- src/object/task/tasktake.h | 14 +-- src/object/task/taskterraform.cpp | 31 +++--- src/object/task/taskterraform.h | 8 +- src/object/task/taskturn.cpp | 19 ++-- src/object/task/taskturn.h | 6 +- src/object/task/taskwait.cpp | 11 +- src/object/task/taskwait.h | 4 +- 42 files changed, 515 insertions(+), 543 deletions(-) (limited to 'src/object/task') diff --git a/src/object/task/task.cpp b/src/object/task/task.cpp index ad1c848..4be6067 100644 --- a/src/object/task/task.cpp +++ b/src/object/task/task.cpp @@ -77,9 +77,9 @@ CTask::~CTask() // Management of an event. -BOOL CTask::EventProcess(const Event &event) +bool CTask::EventProcess(const Event &event) { - return TRUE; + return true; } @@ -93,17 +93,17 @@ Error CTask::IsEnded() // Indicates whether the action is pending. -BOOL CTask::IsBusy() +bool CTask::IsBusy() { - return TRUE; + return true; } // Suddenly ends the current action. -BOOL CTask::Abort() +bool CTask::Abort() { - return TRUE; + return true; } diff --git a/src/object/task/task.h b/src/object/task/task.h index 1970f7f..b85fa32 100644 --- a/src/object/task/task.h +++ b/src/object/task/task.h @@ -60,10 +60,10 @@ public: CTask(CInstanceManager* iMan, CObject* object); virtual ~CTask(); - virtual BOOL EventProcess(const Event &event); + virtual bool EventProcess(const Event &event); virtual Error IsEnded(); - virtual BOOL IsBusy(); - virtual BOOL Abort(); + virtual bool IsBusy(); + virtual bool Abort(); protected: diff --git a/src/object/task/taskadvance.cpp b/src/object/task/taskadvance.cpp index 8bbc7b3..41b1602 100644 --- a/src/object/task/taskadvance.cpp +++ b/src/object/task/taskadvance.cpp @@ -44,7 +44,6 @@ CTaskAdvance::CTaskAdvance(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); } // Object's destructor. @@ -56,10 +55,10 @@ CTaskAdvance::~CTaskAdvance() // Management of an event. -BOOL CTaskAdvance::EventProcess(const Event &event) +bool CTaskAdvance::EventProcess(const Event &event) { - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; m_fixTime += event.rTime; @@ -68,12 +67,12 @@ BOOL CTaskAdvance::EventProcess(const Event &event) { m_physics->SetMotorSpeedX(0.0f); // stops the advance m_physics->SetMotorSpeedZ(0.0f); // stops the rotation - m_bError = TRUE; - return TRUE; + m_bError = true; + return true; } m_timeLimit -= event.rTime; - return TRUE; + return true; } @@ -95,7 +94,7 @@ Error CTaskAdvance::Start(float length) m_physics->SetMotorSpeedY(0.0f); m_physics->SetMotorSpeedZ(0.0f); - m_bError = FALSE; + m_bError = false; return ERR_OK; } diff --git a/src/object/task/taskadvance.h b/src/object/task/taskadvance.h index 8717728..2b2dcef 100644 --- a/src/object/task/taskadvance.h +++ b/src/object/task/taskadvance.h @@ -36,7 +36,7 @@ public: CTaskAdvance(CInstanceManager* iMan, CObject* object); ~CTaskAdvance(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(float length); Error IsEnded(); @@ -51,6 +51,6 @@ protected: D3DVECTOR m_startPos; float m_lastDist; float m_fixTime; - BOOL m_bError; + bool m_bError; }; diff --git a/src/object/task/taskbuild.cpp b/src/object/task/taskbuild.cpp index 5992e5d..77ee14d 100644 --- a/src/object/task/taskbuild.cpp +++ b/src/object/task/taskbuild.cpp @@ -56,8 +56,6 @@ CTaskBuild::CTaskBuild(CInstanceManager* iMan, CObject* object) { int i; - CTask::CTask(iMan, object); - m_type = OBJECT_DERRICK; m_time = 0.0f; m_soundChannel = -1; @@ -91,17 +89,17 @@ CTaskBuild::~CTaskBuild() // Creates a building. -BOOL CTaskBuild::CreateBuilding(D3DVECTOR pos, float angle) +bool CTaskBuild::CreateBuilding(D3DVECTOR pos, float angle) { m_building = new CObject(m_iMan); if ( !m_building->CreateBuilding(pos, angle, 0.0f, m_type, 0.0f) ) { delete m_building; m_building = 0; - return FALSE; + return false; } m_building->UpdateMapping(); - m_building->SetLock(TRUE); // not yet usable + m_building->SetLock(true); // not yet usable if ( m_type == OBJECT_DERRICK ) m_buildingHeight = 35.0f; if ( m_type == OBJECT_FACTORY ) m_buildingHeight = 28.0f; @@ -121,7 +119,7 @@ BOOL CTaskBuild::CreateBuilding(D3DVECTOR pos, float angle) m_buildingPos = m_building->RetPosition(0); m_buildingPos.y -= m_buildingHeight; m_building->SetPosition(0, m_buildingPos); - return TRUE; + return true; } // Creates lights for the effects. @@ -185,7 +183,7 @@ void CTaskBuild::CreateLight() angle += (PI*2.0f)/TBMAXLIGHT; } - m_bBlack = FALSE; + m_bBlack = false; } // Switches the lights from black to white. @@ -207,21 +205,21 @@ void CTaskBuild::BlackLight() m_light->SetLightColorSpeed(m_lightRank[i], 1.0f/((1.0f/m_speed)*0.75f)); } - m_bBlack = TRUE; + m_bBlack = true; } // Management of an event. -BOOL CTaskBuild::EventProcess(const Event &event) +bool CTaskBuild::EventProcess(const Event &event) { D3DMATRIX* mat; D3DVECTOR pos, dir, speed; FPOINT dim; float a, g, cirSpeed, dist, linSpeed; - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; - if ( m_bError ) return FALSE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; + if ( m_bError ) return false; m_time += event.rTime; @@ -236,7 +234,7 @@ BOOL CTaskBuild::EventProcess(const Event &event) if ( cirSpeed < -1.0f ) cirSpeed = -1.0f; m_physics->SetMotorSpeedZ(cirSpeed); // turns left/right - return TRUE; + return true; } if ( m_phase == TBP_MOVE ) // preliminary forward/backward? @@ -246,48 +244,48 @@ BOOL CTaskBuild::EventProcess(const Event &event) if ( dist > 30.0f ) linSpeed = 1.0f; if ( dist < 30.0f ) linSpeed = -1.0f; m_physics->SetMotorSpeedX(linSpeed); // forward/backward - return TRUE; + return true; } if ( m_phase == TBP_RECEDE ) // terminal back? { m_physics->SetMotorSpeedX(-1.0f); // back - return TRUE; + return true; } if ( m_phase == TBP_TAKE ) // takes gun? { - return TRUE; + return true; } if ( m_phase == TBP_PREP ) // prepares? { - return TRUE; + return true; } if ( m_phase == TBP_TERM ) // ends? { - return TRUE; + return true; } if ( !m_bBuild ) // building to build? { - m_bBuild = TRUE; + m_bBuild = true; pos = m_metal->RetPosition(0); a = m_object->RetAngleY(0); if ( !CreateBuilding(pos, a+PI) ) { - m_metal->SetLock(FALSE); // usable again + m_metal->SetLock(false); // usable again m_motion->SetAction(-1); m_object->SetObjectParent(14, 0); m_object->SetPosition(14, D3DVECTOR(-1.5f, 0.3f, -1.35f)); m_object->SetAngleZ(14, PI); m_camera->FlushEffect(); Abort(); - m_bError = TRUE; + m_bError = true; m_displayText->DisplayError(ERR_TOOMANY, m_object->RetPosition(0)); - return FALSE; + return false; } CreateLight(); } @@ -340,7 +338,7 @@ BOOL CTaskBuild::EventProcess(const Event &event) } } - return TRUE; + return true; } @@ -360,7 +358,7 @@ Error CTaskBuild::Start(ObjectType type) iAngle = NormAngle(iAngle); // 0..2*PI oAngle = iAngle; - m_bError = TRUE; // operation impossible + m_bError = true; // operation impossible pos = m_object->RetPosition(0); if ( pos.y < m_water->RetLevel() ) return ERR_BUILD_WATER; @@ -385,7 +383,7 @@ Error CTaskBuild::Start(ObjectType type) err = FlatFloor(); if ( err != ERR_OK ) return err; - m_metal->SetLock(TRUE); // not usable + m_metal->SetLock(true); // not usable m_camera->StartCentering(m_object, PI*0.15f, 99.9f, 0.0f, 1.0f); m_phase = TBP_TURN; // rotation necessary preliminary @@ -396,10 +394,10 @@ Error CTaskBuild::Start(ObjectType type) pm = m_metal->RetPosition(0); m_angleZ = RotateAngle(Length2d(pv, pm), Abs(pv.y-pm.y)); - m_physics->SetFreeze(TRUE); // it does not move + m_physics->SetFreeze(true); // it does not move - m_bBuild = FALSE; // not yet built - m_bError = FALSE; // ok + m_bBuild = false; // not yet built + m_bError = false; // ok return ERR_OK; } @@ -456,7 +454,7 @@ Error CTaskBuild::IsEnded() { if ( m_progress > 1.0f ) // timeout? { - m_metal->SetLock(FALSE); // usable again + m_metal->SetLock(false); // usable again if ( dist < 30.0f ) return ERR_BUILD_METALNEAR; else return ERR_BUILD_METALAWAY; } @@ -482,7 +480,7 @@ Error CTaskBuild::IsEnded() { if ( m_progress < 1.0f ) return ERR_CONTINUE; - m_soundChannel = m_sound->Play(SOUND_TREMBLE, m_object->RetPosition(0), 0.0f, 1.0f, TRUE); + m_soundChannel = m_sound->Play(SOUND_TREMBLE, m_object->RetPosition(0), 0.0f, 1.0f, true); m_sound->AddEnvelope(m_soundChannel, 0.7f, 1.0f, 1.0f, SOPER_CONTINUE); m_sound->AddEnvelope(m_soundChannel, 0.7f, 1.5f, 7.0f, SOPER_CONTINUE); m_sound->AddEnvelope(m_soundChannel, 0.0f, 1.5f, 2.0f, SOPER_STOP); @@ -506,7 +504,7 @@ Error CTaskBuild::IsEnded() m_building->SetZoom(0, 1.0f); m_building->SetCirVibration(D3DVECTOR(0.0f, 0.0f, 0.0f)); - m_building->SetLock(FALSE); // building usable + m_building->SetLock(false); // building usable m_main->CreateShortcuts(); m_displayText->DisplayError(INFO_BUILD, m_buildingPos, 10.0f, 50.0f); @@ -555,7 +553,7 @@ Error CTaskBuild::IsEnded() // Suddenly ends the current action. -BOOL CTaskBuild::Abort() +bool CTaskBuild::Abort() { if ( m_soundChannel != -1 ) { @@ -565,8 +563,8 @@ BOOL CTaskBuild::Abort() } m_camera->StopCentering(m_object, 2.0f); - m_physics->SetFreeze(FALSE); // is moving again - return TRUE; + m_physics->SetFreeze(false); // is moving again + return true; } @@ -581,7 +579,7 @@ Error CTaskBuild::FlatFloor() FPOINT c, p; float radius, max, oRadius, bRadius, angle, dist; int i, j; - BOOL bLittleFlat, bBase; + bool bLittleFlat, bBase; radius = 0.0f; if ( m_type == OBJECT_DERRICK ) radius = 5.0f; @@ -614,7 +612,7 @@ Error CTaskBuild::FlatFloor() } max = 100000.0f; - bBase = FALSE; + bBase = false; for ( i=0 ; i<1000000 ; i++ ) { pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, i); @@ -635,7 +633,7 @@ Error CTaskBuild::FlatFloor() max = dist; bPos = oPos; bRadius = oRadius; - bBase = TRUE; + bBase = true; } } else @@ -649,7 +647,7 @@ Error CTaskBuild::FlatFloor() max = dist; bPos = oPos; bRadius = oRadius; - bBase = FALSE; + bBase = false; } } } @@ -725,7 +723,7 @@ CObject* CTaskBuild::SearchMetalObject(float &angle, float dMin, float dMax, ObjectType type; float min, iAngle, a, aa, aBest, distance, magic; int i; - BOOL bMetal; + bool bMetal; iPos = m_object->RetPosition(0); iAngle = m_object->RetAngleY(0); @@ -733,7 +731,7 @@ CObject* CTaskBuild::SearchMetalObject(float &angle, float dMin, float dMax, min = 1000000.0f; pBest = 0; - bMetal = FALSE; + bMetal = false; for ( i=0 ; i<1000000 ; i++ ) { pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, i); @@ -745,7 +743,7 @@ CObject* CTaskBuild::SearchMetalObject(float &angle, float dMin, float dMax, type = pObj->RetType(); if ( type != OBJECT_METAL ) continue; - bMetal = TRUE; // metal exists + bMetal = true; // metal exists oPos = pObj->RetPosition(0); distance = Length(oPos, iPos); diff --git a/src/object/task/taskbuild.h b/src/object/task/taskbuild.h index 4f045b1..337edb7 100644 --- a/src/object/task/taskbuild.h +++ b/src/object/task/taskbuild.h @@ -53,15 +53,15 @@ public: CTaskBuild(CInstanceManager* iMan, CObject* object); ~CTaskBuild(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(ObjectType type); Error IsEnded(); - BOOL Abort(); + bool Abort(); protected: Error FlatFloor(); - BOOL CreateBuilding(D3DVECTOR pos, float angle); + bool CreateBuilding(D3DVECTOR pos, float angle); void CreateLight(); void BlackLight(); CObject* SearchMetalObject(float &angle, float dMin, float dMax, float aLimit, Error &err); @@ -73,9 +73,9 @@ protected: CObject* m_power; // the vehicle battery CObject* m_building; // building built TaskBuildPhase m_phase; // phase of the operation - BOOL m_bError; // TRUE -> operation impossible - BOOL m_bBuild; // TRUE -> building built - BOOL m_bBlack; // TRUE -> lights black -> white + bool m_bError; // true -> operation impossible + bool m_bBuild; // true -> building built + bool m_bBlack; // true -> lights black -> white float m_time; // absolute time float m_lastParticule; // time of generation last particle float m_progress; // progression (0..1) diff --git a/src/object/task/taskfire.cpp b/src/object/task/taskfire.cpp index 0944931..02c4159 100644 --- a/src/object/task/taskfire.cpp +++ b/src/object/task/taskfire.cpp @@ -50,7 +50,6 @@ CTaskFire::CTaskFire(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); m_soundChannel = -1; } @@ -69,7 +68,7 @@ CTaskFire::~CTaskFire() // Management of an event. -BOOL CTaskFire::EventProcess(const Event &event) +bool CTaskFire::EventProcess(const Event &event) { CObject* power; CPhysics* physics; @@ -80,9 +79,9 @@ BOOL CTaskFire::EventProcess(const Event &event) float energy, fire; int i, channel; - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; - if ( m_bError ) return FALSE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; + if ( m_bError ) return false; m_time += event.rTime; m_lastSound -= event.rTime; @@ -273,7 +272,7 @@ BOOL CTaskFire::EventProcess(const Event &event) m_sound->Play(SOUND_FIREp, m_object->RetPosition(0)); } - return TRUE; + return true; } @@ -286,7 +285,7 @@ Error CTaskFire::Start(float delay) float energy, fire; ObjectType type; - m_bError = TRUE; // operation impossible + m_bError = true; // operation impossible type = m_object->RetType(); if ( type != OBJECT_MOBILEfc && @@ -307,13 +306,13 @@ Error CTaskFire::Start(float delay) m_bRay = (type == OBJECT_MOBILErc); - m_bOrganic = FALSE; + m_bOrganic = false; if ( type == OBJECT_MOBILEfi || type == OBJECT_MOBILEti || type == OBJECT_MOBILEwi || type == OBJECT_MOBILEii ) { - m_bOrganic = TRUE; + m_bOrganic = true; } if ( delay == 0.0f ) @@ -336,13 +335,13 @@ Error CTaskFire::Start(float delay) m_time = 0.0f; m_lastParticule = 0.0f; m_lastSound = 0.0f; - m_bError = FALSE; // ok + m_bError = false; // ok //? m_camera->StartCentering(m_object, PI*0.15f, 99.9f, 0.0f, 1.0f); if ( m_bOrganic ) { - m_soundChannel = m_sound->Play(SOUND_FIREi, m_object->RetPosition(0), 1.0f, 1.0f, TRUE); + m_soundChannel = m_sound->Play(SOUND_FIREi, m_object->RetPosition(0), 1.0f, 1.0f, true); if ( m_soundChannel != -1 ) { m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.0f, m_delay, SOPER_CONTINUE); @@ -354,7 +353,7 @@ Error CTaskFire::Start(float delay) } else { - m_soundChannel = m_sound->Play(SOUND_FIRE, m_object->RetPosition(0), 1.0f, 1.0f, TRUE); + m_soundChannel = m_sound->Play(SOUND_FIRE, m_object->RetPosition(0), 1.0f, 1.0f, true); if ( m_soundChannel != -1 ) { m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.0f, m_delay, SOPER_CONTINUE); @@ -379,7 +378,7 @@ Error CTaskFire::IsEnded() // Suddenly ends the current action. -BOOL CTaskFire::Abort() +bool CTaskFire::Abort() { m_object->SetInclinaison(D3DVECTOR(0.0f, 0.0f, 0.0f)); m_object->SetCirVibration(D3DVECTOR(0.0f, 0.0f, 0.0f)); @@ -393,6 +392,6 @@ BOOL CTaskFire::Abort() } //? m_camera->StopCentering(m_object, 1.0f); - return TRUE; + return true; } diff --git a/src/object/task/taskfire.h b/src/object/task/taskfire.h index 72b5402..f3d4490 100644 --- a/src/object/task/taskfire.h +++ b/src/object/task/taskfire.h @@ -35,20 +35,20 @@ public: CTaskFire(CInstanceManager* iMan, CObject* object); ~CTaskFire(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(float delay); Error IsEnded(); - BOOL Abort(); + bool Abort(); protected: protected: float m_delay; float m_progress; - BOOL m_bError; - BOOL m_bRay; - BOOL m_bOrganic; + bool m_bError; + bool m_bRay; + bool m_bOrganic; float m_time; float m_speed; float m_lastParticule; diff --git a/src/object/task/taskfireant.cpp b/src/object/task/taskfireant.cpp index 6947c1b..6f3b9c9 100644 --- a/src/object/task/taskfireant.cpp +++ b/src/object/task/taskfireant.cpp @@ -47,8 +47,6 @@ CTaskFireAnt::CTaskFireAnt(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); - m_phase = TFA_NULL; } @@ -61,19 +59,19 @@ CTaskFireAnt::~CTaskFireAnt() // Management of an event. -BOOL CTaskFireAnt::EventProcess(const Event &event) +bool CTaskFireAnt::EventProcess(const Event &event) { D3DVECTOR dir, vib; float a, g, cirSpeed; - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; - if ( m_bError ) return FALSE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; + if ( m_bError ) return false; if ( m_object->RetFixed() ) // insect on its back? { - m_bError = TRUE; - return FALSE; + m_bError = true; + return false; } m_time += event.rTime; @@ -90,7 +88,7 @@ BOOL CTaskFireAnt::EventProcess(const Event &event) m_physics->SetMotorSpeedZ(cirSpeed); // turns left/right } - return TRUE; + return true; } @@ -103,7 +101,7 @@ Error CTaskFireAnt::Start(D3DVECTOR impact) m_impact = impact; - m_bError = TRUE; // operation impossible + m_bError = true; // operation impossible if ( !m_physics->RetLand() ) return ERR_FIRE_VEH; type = m_object->RetType(); @@ -122,8 +120,8 @@ Error CTaskFireAnt::Start(D3DVECTOR impact) m_progress = 0.0f; m_time = 0.0f; m_lastParticule = 0.0f; - m_bError = FALSE; // ok - m_bFire = FALSE; // once! + m_bError = false; // ok + m_bFire = false; // once! return ERR_OK; } @@ -174,7 +172,7 @@ Error CTaskFireAnt::IsEnded() { if ( m_progress > 0.75f && !m_bFire ) { - m_bFire = TRUE; // once + m_bFire = true; // once for ( i=0 ; i<20 ; i++ ) { @@ -219,9 +217,9 @@ Error CTaskFireAnt::IsEnded() // Suddenly ends the current action. -BOOL CTaskFireAnt::Abort() +bool CTaskFireAnt::Abort() { m_motion->SetAction(-1); - return TRUE; + return true; } diff --git a/src/object/task/taskfireant.h b/src/object/task/taskfireant.h index 18eef90..a94d943 100644 --- a/src/object/task/taskfireant.h +++ b/src/object/task/taskfireant.h @@ -47,11 +47,11 @@ public: CTaskFireAnt(CInstanceManager* iMan, CObject* object); ~CTaskFireAnt(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(D3DVECTOR impact); Error IsEnded(); - BOOL Abort(); + bool Abort(); protected: @@ -61,8 +61,8 @@ protected: float m_progress; float m_speed; float m_angle; - BOOL m_bError; - BOOL m_bFire; + bool m_bError; + bool m_bFire; float m_time; float m_lastParticule; }; diff --git a/src/object/task/taskflag.cpp b/src/object/task/taskflag.cpp index 6c228c4..667b179 100644 --- a/src/object/task/taskflag.cpp +++ b/src/object/task/taskflag.cpp @@ -52,7 +52,6 @@ CTaskFlag::CTaskFlag(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); } // Object's destructor. @@ -64,15 +63,15 @@ CTaskFlag::~CTaskFlag() // Management of an event. -BOOL CTaskFlag::EventProcess(const Event &event) +bool CTaskFlag::EventProcess(const Event &event) { - if ( m_bError ) return TRUE; - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; + if ( m_bError ) return true; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; m_time += event.rTime; - return TRUE; + return true; } @@ -87,7 +86,7 @@ Error CTaskFlag::Start(TaskFlagOrder order, int rank) m_order = order; m_time = 0.0f; - m_bError = TRUE; // operation impossible + m_bError = true; // operation impossible if ( !m_physics->RetLand() ) { pos = m_object->RetPosition(0); @@ -113,7 +112,7 @@ Error CTaskFlag::Start(TaskFlagOrder order, int rank) if ( err != ERR_OK ) return err; } - m_bError = FALSE; + m_bError = false; m_motion->SetAction(MHS_FLAG); // sets/removes flag m_camera->StartCentering(m_object, PI*0.3f, 99.9f, 0.0f, 0.5f); @@ -136,11 +135,11 @@ Error CTaskFlag::IsEnded() // Suddenly ends the current action. -BOOL CTaskFlag::Abort() +bool CTaskFlag::Abort() { m_motion->SetAction(-1); m_camera->StopCentering(m_object, 2.0f); - return TRUE; + return true; } diff --git a/src/object/task/taskflag.h b/src/object/task/taskflag.h index 4c06630..31876fe 100644 --- a/src/object/task/taskflag.h +++ b/src/object/task/taskflag.h @@ -43,11 +43,11 @@ public: CTaskFlag(CInstanceManager* iMan, CObject* object); ~CTaskFlag(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(TaskFlagOrder order, int rank); Error IsEnded(); - BOOL Abort(); + bool Abort(); protected: Error CreateFlag(int rank); @@ -58,6 +58,6 @@ protected: protected: TaskFlagOrder m_order; float m_time; - BOOL m_bError; + bool m_bError; }; diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp index ec10f0a..7e4d3f1 100644 --- a/src/object/task/taskgoto.cpp +++ b/src/object/task/taskgoto.cpp @@ -51,8 +51,6 @@ CTaskGoto::CTaskGoto(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); - m_bmArray = 0; } @@ -66,25 +64,25 @@ CTaskGoto::~CTaskGoto() // Management of an event. -BOOL CTaskGoto::EventProcess(const Event &event) +bool CTaskGoto::EventProcess(const Event &event) { D3DVECTOR pos, goal; FPOINT rot, repulse; float a, g, dist, linSpeed, cirSpeed, h, hh, factor, dir; Error ret; - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; // Momentarily stationary object (ant on the back)? if ( m_object->RetFixed() ) { m_physics->SetMotorSpeedX(0.0f); // stops the advance m_physics->SetMotorSpeedZ(0.0f); // stops the rotation - return TRUE; + return true; } - if ( m_error != ERR_OK ) return FALSE; + if ( m_error != ERR_OK ) return false; if ( m_bWorm ) { @@ -129,7 +127,7 @@ BOOL CTaskGoto::EventProcess(const Event &event) m_physics->SetMotorSpeedZ(cirSpeed); // turns left / right m_physics->SetMotorSpeedX(linSpeed); // advance - return TRUE; + return true; } if ( m_phase == TGP_BEAMSEARCH ) // search path? @@ -190,27 +188,27 @@ BOOL CTaskGoto::EventProcess(const Event &event) BitmapDebug(min, max, m_object->RetPosition(0), m_goal); #endif m_error = ret; - return FALSE; + return false; } - return TRUE; + return true; } if ( m_phase == TGP_BEAMWCOLD ) // expects cooled reactor? { - return TRUE; + return true; } if ( m_phase == TGP_BEAMUP ) // off? { m_physics->SetMotorSpeedY(1.0f); // up - return TRUE; + return true; } if ( m_phase == TGP_BEAMGOTO ) // goto dot list? (?) { if ( m_physics->RetCollision() ) // collision? { - m_physics->SetCollision(FALSE); // there's more + m_physics->SetCollision(false); // there's more } pos = m_object->RetPosition(0); @@ -231,7 +229,7 @@ BOOL CTaskGoto::EventProcess(const Event &event) { goal = m_bmPoints[m_bmIndex]; goal.y = pos.y; - h = m_terrain->RetFloorHeight(goal, TRUE, TRUE); + h = m_terrain->RetFloorHeight(goal, true, true); dist = Length2d(pos, goal); if ( dist != 0.0f ) // anticipates? { @@ -241,7 +239,7 @@ BOOL CTaskGoto::EventProcess(const Event &event) goal.z = pos.z + (goal.z-pos.z)*linSpeed*20.0f/dist; } goal.y = pos.y; - hh = m_terrain->RetFloorHeight(goal, TRUE, TRUE); + hh = m_terrain->RetFloorHeight(goal, true, true); h = Min(h, hh); linSpeed = 0.0f; if ( h < m_altitude-1.0f ) @@ -303,24 +301,24 @@ BOOL CTaskGoto::EventProcess(const Event &event) m_physics->SetMotorSpeedX(0.0f); // stops the advance m_physics->SetMotorSpeedZ(0.0f); // stops the rotation BeamStart(); // we start all - return TRUE; + return true; } m_physics->SetMotorSpeedZ(cirSpeed); // turns left / right m_physics->SetMotorSpeedX(linSpeed); // advance - return TRUE; + return true; } if ( m_phase == TGP_BEAMDOWN ) // landed? { m_physics->SetMotorSpeedY(-0.5f); // tomb - return TRUE; + return true; } if ( m_phase == TGP_LAND ) // landed? { m_physics->SetMotorSpeedY(-0.5f); // tomb - return TRUE; + return true; } if ( m_goalMode == TGG_EXPRESS ) @@ -329,9 +327,9 @@ BOOL CTaskGoto::EventProcess(const Event &event) { if ( m_physics->RetCollision() ) // collision? { - m_physics->SetCollision(FALSE); // there's more + m_physics->SetCollision(false); // there's more m_error = ERR_STOP; - return TRUE; + return true; } } @@ -339,7 +337,7 @@ BOOL CTaskGoto::EventProcess(const Event &event) if ( m_altitude > 0.0f ) { - h = m_terrain->RetFloorHeight(pos, TRUE, TRUE); + h = m_terrain->RetFloorHeight(pos, true, true); linSpeed = 0.0f; if ( h < m_altitude ) { @@ -362,7 +360,7 @@ BOOL CTaskGoto::EventProcess(const Event &event) m_physics->SetMotorSpeedZ(cirSpeed); // turns left / right m_physics->SetMotorSpeedX(1.0f); // advance - return TRUE; + return true; } if ( m_phase != TGP_TURN && @@ -375,7 +373,7 @@ BOOL CTaskGoto::EventProcess(const Event &event) if ( factor < 0.0f ) factor = 0.0f; if ( factor > 1.0f ) factor = 1.0f; - h = m_terrain->RetFloorHeight(m_object->RetPosition(0), TRUE, TRUE); + h = m_terrain->RetFloorHeight(m_object->RetPosition(0), true, true); linSpeed = 0.0f; if ( h < (m_altitude-0.5f)*factor && factor == 1.0f ) { @@ -395,10 +393,10 @@ BOOL CTaskGoto::EventProcess(const Event &event) { if ( m_physics->RetCollision() ) // collision? { - m_physics->SetCollision(FALSE); // there's more + m_physics->SetCollision(false); // there's more m_time = 0.0f; m_phase = TGP_CRWAIT; - return TRUE; + return true; } #if 0 @@ -487,10 +485,10 @@ BOOL CTaskGoto::EventProcess(const Event &event) { if ( m_physics->RetCollision() ) // collision? { - m_physics->SetCollision(FALSE); // there's more + m_physics->SetCollision(false); // there's more m_time = 0.0f; m_phase = TGP_CLWAIT; - return TRUE; + return true; } m_physics->SetMotorSpeedX(0.5f); // advance mollo } @@ -499,10 +497,10 @@ BOOL CTaskGoto::EventProcess(const Event &event) { if ( m_physics->RetCollision() ) // collision? { - m_physics->SetCollision(FALSE); // there's more + m_physics->SetCollision(false); // there's more m_time = 0.0f; m_phase = TGP_CRWAIT; - return TRUE; + return true; } m_physics->SetMotorSpeedX(0.5f); // advance mollo } @@ -513,7 +511,7 @@ BOOL CTaskGoto::EventProcess(const Event &event) m_physics->SetMotorSpeedX(1.0f); } - return TRUE; + return true; } @@ -618,7 +616,7 @@ void CTaskGoto::WormFrame(float rTime) dist = Length(pos, impact); if ( dist <= 15.0f ) { - pObj->SetVirusMode(TRUE); // bam, infected! + pObj->SetVirusMode(true); // bam, infected! } } } @@ -672,7 +670,7 @@ Error CTaskGoto::Start(D3DVECTOR goal, float altitude, m_goalObject = goal; m_goal = goal; - m_bTake = FALSE; + m_bTake = false; m_phase = TGP_ADVANCE; m_error = ERR_OK; m_try = 0; @@ -686,14 +684,14 @@ Error CTaskGoto::Start(D3DVECTOR goal, float altitude, m_crashMode = TGC_RIGHTLEFT; } - m_bWorm = FALSE; + m_bWorm = false; if ( type == OBJECT_WORM ) { - m_bWorm = TRUE; + m_bWorm = true; m_wormLastTime = 0.0f; } - m_bApprox = FALSE; + m_bApprox = false; if ( type == OBJECT_HUMAN || type == OBJECT_TECH || type == OBJECT_MOTHER || @@ -706,7 +704,7 @@ Error CTaskGoto::Start(D3DVECTOR goal, float altitude, type == OBJECT_MOBILErr || type == OBJECT_MOBILErs ) { - m_bApprox = TRUE; + m_bApprox = true; } if ( !m_bApprox && m_crashMode != TGC_BEAM ) @@ -721,12 +719,12 @@ Error CTaskGoto::Start(D3DVECTOR goal, float altitude, dist = 0.0f; AdjustTarget(target, m_goal, dist); } - m_bTake = TRUE; // object was taken on arrival (final rotation) + m_bTake = true; // object was taken on arrival (final rotation) } } m_lastDistance = 1000.0f; - m_physics->SetCollision(FALSE); + m_physics->SetCollision(false); if ( m_crashMode == TGC_BEAM ) // with the algorithm of rays? { @@ -751,7 +749,7 @@ Error CTaskGoto::Start(D3DVECTOR goal, float altitude, m_bmFinalMove = dist; } } - m_bTake = TRUE; // object was taken on arrival (final rotation) + m_bTake = true; // object was taken on arrival (final rotation) } if ( m_physics->RetType() == TYPE_FLYING && m_altitude == 0.0f ) @@ -833,7 +831,7 @@ Error CTaskGoto::IsEnded() { if ( m_physics->RetType() == TYPE_FLYING && m_altitude > 0.0f ) { - level = m_terrain->RetFloorLevel(pos, TRUE, TRUE); + level = m_terrain->RetFloorLevel(pos, true, true); h = level+m_altitude-20.0f; limit = m_terrain->RetFlyingMaxHeight(); if ( h > limit ) h = limit; @@ -1096,9 +1094,9 @@ CObject* CTaskGoto::SearchTarget(D3DVECTOR pos, float margin) } // Adjusts the target as a function of the object. -// Returns TRUE if it is cargo laying on the ground, which can be approached from any site. +// Returns true if it is cargo laying on the ground, which can be approached from any site. -BOOL CTaskGoto::AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance) +bool CTaskGoto::AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance) { ObjectType type; Character* character; @@ -1111,7 +1109,7 @@ BOOL CTaskGoto::AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance) type == OBJECT_WORM ) { pos = pObj->RetPosition(0); - return FALSE; // single approach + return false; // single approach } type = pObj->RetType(); @@ -1146,7 +1144,7 @@ BOOL CTaskGoto::AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance) goal = pObj->RetPosition(0); dist = Length(goal, pos); pos = (pos-goal)*(TAKE_DIST+distance)/dist + goal; - return TRUE; // approach from all sites + return true; // approach from all sites } if ( type == OBJECT_BASE ) @@ -1155,7 +1153,7 @@ BOOL CTaskGoto::AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance) goal = pObj->RetPosition(0); dist = Length(goal, pos); pos = (pos-goal)*(TAKE_DIST+distance)/dist + goal; - return TRUE; // approach from all sites + return true; // approach from all sites } if ( type == OBJECT_MOBILEfa || @@ -1191,25 +1189,25 @@ BOOL CTaskGoto::AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance) pos.x -= TAKE_DIST+TAKE_DIST_OTHER+distance; mat = pObj->RetWorldMatrix(0); pos = Transform(*mat, pos); - return FALSE; // single approach + return false; // single approach } - if ( GetHotPoint(pObj, goal, TRUE, distance, suppl) ) + if ( GetHotPoint(pObj, goal, true, distance, suppl) ) { pos = goal; distance += suppl; - return FALSE; // single approach + return false; // single approach } pos = pObj->RetPosition(0); distance = 0.0f; - return FALSE; // single approach + return false; // single approach } // If you are on an object produced by a building (ore produced by derrick), // changes the position by report the building. -BOOL CTaskGoto::AdjustBuilding(D3DVECTOR &pos, float margin, float &distance) +bool CTaskGoto::AdjustBuilding(D3DVECTOR &pos, float margin, float &distance) { CObject* pObj; D3DVECTOR oPos; @@ -1224,22 +1222,22 @@ BOOL CTaskGoto::AdjustBuilding(D3DVECTOR &pos, float margin, float &distance) if ( !pObj->RetActif() ) continue; if ( pObj->RetTruck() != 0 ) continue; // object transported? - if ( !GetHotPoint(pObj, oPos, FALSE, 0.0f, suppl) ) continue; + if ( !GetHotPoint(pObj, oPos, false, 0.0f, suppl) ) continue; dist = Length2d(pos, oPos); if ( dist <= margin ) { - GetHotPoint(pObj, pos, TRUE, distance, suppl); + GetHotPoint(pObj, pos, true, distance, suppl); distance += suppl; - return TRUE; + return true; } } - return FALSE; + return false; } // Returns the item or product or pose is something on a building. -BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, - BOOL bTake, float distance, float &suppl) +bool CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, + bool bTake, float distance, float &suppl) { ObjectType type; D3DMATRIX* mat; @@ -1255,7 +1253,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 4.0f; if ( bTake ) pos.x += TAKE_DIST+distance+suppl; pos = Transform(*mat, pos); - return TRUE; + return true; } if ( type == OBJECT_CONVERT ) @@ -1265,7 +1263,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 4.0f; if ( bTake ) pos.x += TAKE_DIST+distance+suppl; pos = Transform(*mat, pos); - return TRUE; + return true; } if ( type == OBJECT_RESEARCH ) @@ -1275,7 +1273,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 2.5f; if ( bTake ) pos.x += TAKE_DIST+TAKE_DIST_OTHER+distance+suppl; pos = Transform(*mat, pos); - return TRUE; + return true; } if ( type == OBJECT_ENERGY ) @@ -1285,7 +1283,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 6.0f; if ( bTake ) pos.x += TAKE_DIST+TAKE_DIST_OTHER+distance; pos = Transform(*mat, pos); - return TRUE; + return true; } if ( type == OBJECT_TOWER ) @@ -1295,7 +1293,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 4.0f; if ( bTake ) pos.x += TAKE_DIST+TAKE_DIST_OTHER+distance+suppl; pos = Transform(*mat, pos); - return TRUE; + return true; } if ( type == OBJECT_LABO ) @@ -1305,7 +1303,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 6.0f; if ( bTake ) pos.x += TAKE_DIST+TAKE_DIST_OTHER+distance; pos = Transform(*mat, pos); - return TRUE; + return true; } if ( type == OBJECT_NUCLEAR ) @@ -1315,7 +1313,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 4.0f; if ( bTake ) pos.x += TAKE_DIST+TAKE_DIST_OTHER+distance+suppl; pos = Transform(*mat, pos); - return TRUE; + return true; } if ( type == OBJECT_FACTORY ) @@ -1325,7 +1323,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 6.0f; if ( bTake ) pos.x += TAKE_DIST+distance+suppl; pos = Transform(*mat, pos); - return TRUE; + return true; } if ( type == OBJECT_STATION ) @@ -1335,7 +1333,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 4.0f; if ( bTake ) pos.x += distance; pos = Transform(*mat, pos); - return TRUE; + return true; } if ( type == OBJECT_REPAIR ) @@ -1345,7 +1343,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 4.0f; if ( bTake ) pos.x += distance; pos = Transform(*mat, pos); - return TRUE; + return true; } if ( type == OBJECT_DESTROYER ) @@ -1355,7 +1353,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 4.0f; if ( bTake ) pos.x += TAKE_DIST+distance+suppl; pos = Transform(*mat, pos); - return TRUE; + return true; } if ( type == OBJECT_PARA && m_physics->RetType() == TYPE_FLYING ) @@ -1364,24 +1362,24 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 20.0f; if ( bTake ) pos.x += distance+suppl; pos = Transform(*mat, pos); - return TRUE; + return true; } suppl = 0.0f; - return FALSE; + return false; } // Seeks an object too close that he must flee. -BOOL CTaskGoto::LeakSearch(D3DVECTOR &pos, float &delay) +bool CTaskGoto::LeakSearch(D3DVECTOR &pos, float &delay) { CObject *pObj, *pObstacle; D3DVECTOR iPos, oPos, bPos; float iRadius, oRadius, bRadius, dist, min, dir; int i, j; - if ( !m_physics->RetLand() ) return FALSE; // in flight? + if ( !m_physics->RetLand() ) return false; // in flight? m_object->GetCrashSphere(0, iPos, iRadius); @@ -1409,9 +1407,9 @@ BOOL CTaskGoto::LeakSearch(D3DVECTOR &pos, float &delay) } } } - if ( min > iRadius+bRadius+4.0f ) return FALSE; + if ( min > iRadius+bRadius+4.0f ) return false; - m_bLeakRecede = FALSE; + m_bLeakRecede = false; dist = 4.0f; dir = 1.0f; @@ -1419,12 +1417,12 @@ BOOL CTaskGoto::LeakSearch(D3DVECTOR &pos, float &delay) { dist = 16.0f; dir = -1.0f; - m_bLeakRecede = TRUE; // simply recoils + m_bLeakRecede = true; // simply recoils } pos = bPos; delay = m_physics->RetLinTimeLength(dist, dir); - return TRUE; + return true; } @@ -1484,7 +1482,7 @@ void CTaskGoto::ComputeRepulse(FPOINT &dir) CObject *pObj; float gDist, add, addi, fac, dist, iRadius, oRadius; int i, j; - BOOL bAlien; + bool bAlien; dir.x = 0.0f; dir.y = 0.0f; @@ -1558,14 +1556,14 @@ void CTaskGoto::ComputeRepulse(FPOINT &dir) } } - bAlien = FALSE; + bAlien = false; if ( iType == OBJECT_MOTHER || iType == OBJECT_ANT || iType == OBJECT_SPIDER || iType == OBJECT_BEE || iType == OBJECT_WORM ) { - bAlien = TRUE; + bAlien = true; } for ( i=0 ; i<1000000 ; i++ ) @@ -1705,7 +1703,7 @@ int CTaskGoto::BeamShortcut() for ( i=m_bmTotal ; i>=m_bmIndex+2 ; i-- ) // tries from the last { - if ( BitmapTestLine(m_bmPoints[m_bmIndex], m_bmPoints[i], 0.0f, FALSE) ) + if ( BitmapTestLine(m_bmPoints[m_bmIndex], m_bmPoints[i], 0.0f, false) ) { return i; // bingo, found } @@ -1816,7 +1814,7 @@ Error CTaskGoto::BeamExplore(const D3DVECTOR &prevPos, const D3DVECTOR &curPos, } else { - if ( !BitmapTestLine(prevPos, curPos, angle/nbDiv, TRUE) ) return ERR_GOTO_IMPOSSIBLE; + if ( !BitmapTestLine(prevPos, curPos, angle/nbDiv, true) ) return ERR_GOTO_IMPOSSIBLE; m_bmPoints[i] = curPos; @@ -1830,7 +1828,7 @@ Error CTaskGoto::BeamExplore(const D3DVECTOR &prevPos, const D3DVECTOR &curPos, { newPos = BeamPoint(curPos, goalPos, 0, Length2d(curPos, goalPos)-goalRadius); } - if ( BitmapTestLine(curPos, newPos, angle/nbDiv, FALSE) ) + if ( BitmapTestLine(curPos, newPos, angle/nbDiv, false) ) { m_bmPoints[i+1] = newPos; m_bmTotal = i+1; @@ -1981,18 +1979,18 @@ void CTaskGoto::BitmapDebug(const D3DVECTOR &min, const D3DVECTOR &max, // Tests if a path along a straight line is possible. -BOOL CTaskGoto::BitmapTestLine(const D3DVECTOR &start, const D3DVECTOR &goal, - float stepAngle, BOOL bSecond) +bool CTaskGoto::BitmapTestLine(const D3DVECTOR &start, const D3DVECTOR &goal, + float stepAngle, bool bSecond) { D3DVECTOR pos, inc; float dist, step; float distNoB2; int i, max, x, y; - if ( m_bmArray == 0 ) return TRUE; + if ( m_bmArray == 0 ) return true; dist = Length2d(start, goal); - if ( dist == 0.0f ) return TRUE; + if ( dist == 0.0f ) return true; step = BM_DIM_STEP*0.5f; inc.x = (goal.x-start.x)*step/dist; @@ -2027,7 +2025,7 @@ BOOL CTaskGoto::BitmapTestLine(const D3DVECTOR &start, const D3DVECTOR &goal, if ( bSecond ) { - if ( i > 2 && BitmapTestDot(1, x, y) ) return FALSE; + if ( i > 2 && BitmapTestDot(1, x, y) ) return false; if ( step*(i+1) > distNoB2 && i < max-2 ) { @@ -2035,9 +2033,9 @@ BOOL CTaskGoto::BitmapTestLine(const D3DVECTOR &start, const D3DVECTOR &goal, } } - if ( BitmapTestDot(0, x, y) ) return FALSE; + if ( BitmapTestDot(0, x, y) ) return false; } - return TRUE; + return true; } // Adds the objects in the bitmap. @@ -2063,7 +2061,7 @@ void CTaskGoto::BitmapObject() if ( pObj == m_bmFretObject ) continue; if ( pObj->RetTruck() != 0 ) continue; - h = m_terrain->RetFloorLevel(pObj->RetPosition(0), FALSE); + h = m_terrain->RetFloorLevel(pObj->RetPosition(0), false); if ( m_physics->RetType() == TYPE_FLYING && m_altitude > 0.0f ) { h += m_altitude; @@ -2110,7 +2108,7 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) D3DVECTOR p; float aLimit, angle, h; int x, y; - BOOL bAcceptWater, bFly; + bool bAcceptWater, bFly; if ( minx > maxx ) Swap(minx, maxx); if ( miny > maxy ) Swap(miny, maxy); @@ -2129,8 +2127,8 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) miny >= m_bmMinY && maxy <= m_bmMaxY ) return; aLimit = 20.0f*PI/180.0f; - bAcceptWater = FALSE; - bFly = FALSE; + bAcceptWater = false; + bFly = false; type = m_object->RetType(); @@ -2163,7 +2161,7 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) if ( type == OBJECT_MOBILEsa ) // submarine caterpillars? { aLimit = 35.0f*PI/180.0f; - bAcceptWater = TRUE; + bAcceptWater = true; } if ( type == OBJECT_MOBILEdr ) // designer caterpillars? @@ -2178,7 +2176,7 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) type == OBJECT_MOBILEft ) // flying? { aLimit = 15.0f*PI/180.0f; - bFly = TRUE; + bFly = true; } if ( type == OBJECT_MOBILEia || @@ -2201,7 +2199,7 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) if ( bFly ) // flying robot? { - h = m_terrain->RetFloorLevel(p, TRUE); + h = m_terrain->RetFloorLevel(p, true); if ( h >= m_terrain->RetFlyingMaxHeight()-5.0f ) { BitmapSetDot(0, x, y); @@ -2211,7 +2209,7 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) if ( !bAcceptWater ) // not going underwater? { - h = m_terrain->RetFloorLevel(p, TRUE); + h = m_terrain->RetFloorLevel(p, true); if ( h < m_water->RetLevel()-2.0f ) // under water (*)? { //? BitmapSetDot(0, x, y); @@ -2238,7 +2236,7 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) // Opens an empty bitmap. -BOOL CTaskGoto::BitmapOpen() +bool CTaskGoto::BitmapOpen() { BitmapClose(); @@ -2254,16 +2252,16 @@ BOOL CTaskGoto::BitmapOpen() m_bmMaxX = 0; m_bmMaxY = 0; - return TRUE; + return true; } // Closes the bitmap. -BOOL CTaskGoto::BitmapClose() +bool CTaskGoto::BitmapClose() { free(m_bmArray); m_bmArray = 0; - return TRUE; + return true; } // Puts a circle in the bitmap. @@ -2335,10 +2333,10 @@ void CTaskGoto::BitmapClearDot(int rank, int x, int y) // Tests a point in the bitmap. // x:y: 0..m_bmSize-1 -BOOL CTaskGoto::BitmapTestDot(int rank, int x, int y) +bool CTaskGoto::BitmapTestDot(int rank, int x, int y) { if ( x < 0 || x >= m_bmSize || - y < 0 || y >= m_bmSize ) return FALSE; + y < 0 || y >= m_bmSize ) return false; if ( x < m_bmMinX || x > m_bmMaxX || y < m_bmMinY || y > m_bmMaxY ) diff --git a/src/object/task/taskgoto.h b/src/object/task/taskgoto.h index ed51d3b..acd79b6 100644 --- a/src/object/task/taskgoto.h +++ b/src/object/task/taskgoto.h @@ -82,7 +82,7 @@ public: CTaskGoto(CInstanceManager* iMan, CObject* object); ~CTaskGoto(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(D3DVECTOR goal, float altitude, TaskGotoGoal goalMode, TaskGotoCrash crashMode); Error IsEnded(); @@ -91,10 +91,10 @@ protected: CObject* WormSearch(D3DVECTOR &impact); void WormFrame(float rTime); CObject* SearchTarget(D3DVECTOR pos, float margin); - BOOL AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance); - BOOL AdjustBuilding(D3DVECTOR &pos, float margin, float &distance); - BOOL GetHotPoint(CObject *pObj, D3DVECTOR &pos, BOOL bTake, float distance, float &suppl); - BOOL LeakSearch(D3DVECTOR &pos, float &delay); + bool AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance); + bool AdjustBuilding(D3DVECTOR &pos, float margin, float &distance); + bool GetHotPoint(CObject *pObj, D3DVECTOR &pos, bool bTake, float distance, float &suppl); + bool LeakSearch(D3DVECTOR &pos, float &delay); void ComputeRepulse(FPOINT &dir); void ComputeFlyingRepulse(float &dir); @@ -106,17 +106,17 @@ protected: D3DVECTOR BeamPoint(const D3DVECTOR &startPoint, const D3DVECTOR &goalPoint, float angle, float step); void BitmapDebug(const D3DVECTOR &min, const D3DVECTOR &max, const D3DVECTOR &start, const D3DVECTOR &goal); - BOOL BitmapTestLine(const D3DVECTOR &start, const D3DVECTOR &goal, float stepAngle, BOOL bSecond); + bool BitmapTestLine(const D3DVECTOR &start, const D3DVECTOR &goal, float stepAngle, bool bSecond); void BitmapObject(); void BitmapTerrain(const D3DVECTOR &min, const D3DVECTOR &max); void BitmapTerrain(int minx, int miny, int maxx, int maxy); - BOOL BitmapOpen(); - BOOL BitmapClose(); + bool BitmapOpen(); + bool BitmapClose(); void BitmapSetCircle(const D3DVECTOR &pos, float radius); void BitmapClearCircle(const D3DVECTOR &pos, float radius); void BitmapSetDot(int rank, int x, int y); void BitmapClearDot(int rank, int x, int y); - BOOL BitmapTestDot(int rank, int x, int y); + bool BitmapTestDot(int rank, int x, int y); protected: D3DVECTOR m_goal; @@ -128,12 +128,12 @@ protected: TaskGotoPhase m_phase; int m_try; Error m_error; - BOOL m_bTake; + bool m_bTake; float m_stopLength; // braking distance float m_time; D3DVECTOR m_pos; - BOOL m_bWorm; - BOOL m_bApprox; + bool m_bWorm; + bool m_bApprox; float m_wormLastTime; float m_lastDistance; @@ -159,6 +159,6 @@ protected: D3DVECTOR m_leakPos; // initial position leak float m_leakDelay; float m_leakTime; - BOOL m_bLeakRecede; + bool m_bLeakRecede; }; diff --git a/src/object/task/taskgungoal.cpp b/src/object/task/taskgungoal.cpp index 013c3d4..5a44ade 100644 --- a/src/object/task/taskgungoal.cpp +++ b/src/object/task/taskgungoal.cpp @@ -42,7 +42,6 @@ CTaskGunGoal::CTaskGunGoal(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); } // Object's destructor. @@ -54,12 +53,12 @@ CTaskGunGoal::~CTaskGunGoal() // Management of an event. -BOOL CTaskGunGoal::EventProcess(const Event &event) +bool CTaskGunGoal::EventProcess(const Event &event) { float dir; - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; m_progress += event.rTime*m_speed; @@ -83,7 +82,7 @@ BOOL CTaskGunGoal::EventProcess(const Event &event) } m_object->SetGunGoalH(dir); - return TRUE; + return true; } @@ -127,7 +126,7 @@ Error CTaskGunGoal::Start(float dirV, float dirH) if ( m_finalDirV != m_initialDirV || m_finalDirH != m_initialDirH ) { - i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.3f, 1.5f, TRUE); + i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.3f, 1.5f, true); m_sound->AddEnvelope(i, 0.3f, 1.5f, 1.0f/m_speed, SOPER_STOP); } @@ -154,8 +153,8 @@ Error CTaskGunGoal::IsEnded() // Suddenly ends the current action. -BOOL CTaskGunGoal::Abort() +bool CTaskGunGoal::Abort() { - return TRUE; + return true; } diff --git a/src/object/task/taskgungoal.h b/src/object/task/taskgungoal.h index 14e42b4..2ef8efc 100644 --- a/src/object/task/taskgungoal.h +++ b/src/object/task/taskgungoal.h @@ -35,11 +35,11 @@ public: CTaskGunGoal(CInstanceManager* iMan, CObject* object); ~CTaskGunGoal(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(float dirV, float dirH); Error IsEnded(); - BOOL Abort(); + bool Abort(); protected: diff --git a/src/object/task/taskinfo.cpp b/src/object/task/taskinfo.cpp index ba36cec..9897c88 100644 --- a/src/object/task/taskinfo.cpp +++ b/src/object/task/taskinfo.cpp @@ -47,7 +47,6 @@ CTaskInfo::CTaskInfo(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); } // Object's destructor. @@ -59,22 +58,22 @@ CTaskInfo::~CTaskInfo() // Management of an event. -BOOL CTaskInfo::EventProcess(const Event &event) +bool CTaskInfo::EventProcess(const Event &event) { - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; - if ( m_bError ) return FALSE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; + if ( m_bError ) return false; m_progress += event.rTime*m_speed; // other advance m_time += event.rTime; - return TRUE; + return true; } // Assigns the goal was achieved. -Error CTaskInfo::Start(char *name, float value, float power, BOOL bSend) +Error CTaskInfo::Start(char *name, float value, float power, bool bSend) { CObject* pInfo; CAutoInfo* pAuto; @@ -82,7 +81,7 @@ Error CTaskInfo::Start(char *name, float value, float power, BOOL bSend) Info info; int i, total, op; - m_bError = TRUE; + m_bError = true; m_object->SetInfoReturn(NAN); pInfo = SearchInfo(power); // seeks terminal @@ -167,7 +166,7 @@ Error CTaskInfo::Start(char *name, float value, float power, BOOL bSend) m_speed = 1.0f/1.0f; m_time = 0.0f; - m_bError = FALSE; // ok + m_bError = false; // ok return ERR_OK; } @@ -188,9 +187,9 @@ Error CTaskInfo::IsEnded() // Suddenly ends the current action. -BOOL CTaskInfo::Abort() +bool CTaskInfo::Abort() { - return TRUE; + return true; } diff --git a/src/object/task/taskinfo.h b/src/object/task/taskinfo.h index 1461c3e..5f08f01 100644 --- a/src/object/task/taskinfo.h +++ b/src/object/task/taskinfo.h @@ -36,11 +36,11 @@ public: CTaskInfo(CInstanceManager* iMan, CObject* object); ~CTaskInfo(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); - Error Start(char *name, float value, float power, BOOL bSend); + Error Start(char *name, float value, float power, bool bSend); Error IsEnded(); - BOOL Abort(); + bool Abort(); protected: CObject* SearchInfo(float power); @@ -49,6 +49,6 @@ protected: float m_progress; float m_speed; float m_time; - BOOL m_bError; + bool m_bError; }; diff --git a/src/object/task/taskmanager.cpp b/src/object/task/taskmanager.cpp index 43ac2af..08ab0ce 100644 --- a/src/object/task/taskmanager.cpp +++ b/src/object/task/taskmanager.cpp @@ -63,7 +63,7 @@ CTaskManager::CTaskManager(CInstanceManager* iMan, CObject* object) m_task = 0; m_object = object; - m_bPilot = FALSE; + m_bPilot = false; } // Object's destructor. @@ -149,7 +149,7 @@ Error CTaskManager::StartTaskSearch() // Reads an information terminal. -Error CTaskManager::StartTaskInfo(char *name, float value, float power, BOOL bSend) +Error CTaskManager::StartTaskInfo(char *name, float value, float power, bool bSend) { m_task = new CTaskInfo(m_iMan, m_object); return ((CTaskInfo*)m_task)->Start(name, value, power, bSend); @@ -165,7 +165,7 @@ Error CTaskManager::StartTaskTerraform() // Changes the pencil. -Error CTaskManager::StartTaskPen(BOOL bDown, int color) +Error CTaskManager::StartTaskPen(bool bDown, int color) { m_task = new CTaskPen(m_iMan, m_object); return ((CTaskPen*)m_task)->Start(bDown, color); @@ -203,7 +203,7 @@ Error CTaskManager::StartTaskShield(TaskShieldMode mode, float delay) Error CTaskManager::StartTaskFire(float delay) { - m_bPilot = TRUE; + m_bPilot = true; m_task = new CTaskFire(m_iMan, m_object); return ((CTaskFire*)m_task)->Start(delay); } @@ -246,9 +246,9 @@ Error CTaskManager::StartTaskReset(D3DVECTOR goal, D3DVECTOR angle) // Management of an event. -BOOL CTaskManager::EventProcess(const Event &event) +bool CTaskManager::EventProcess(const Event &event) { - if ( m_task == 0 ) return FALSE; + if ( m_task == 0 ) return false; return m_task->EventProcess(event); } @@ -264,9 +264,9 @@ Error CTaskManager::IsEnded() // Indicates whether the action is pending. -BOOL CTaskManager::IsBusy() +bool CTaskManager::IsBusy() { - if ( m_task == 0 ) return FALSE; + if ( m_task == 0 ) return false; return m_task->IsBusy(); } @@ -274,7 +274,7 @@ BOOL CTaskManager::IsBusy() // Indicates whether it is possible to control the robot // during the execution of the current task. -BOOL CTaskManager::IsPilot() +bool CTaskManager::IsPilot() { return m_bPilot; } @@ -282,9 +282,9 @@ BOOL CTaskManager::IsPilot() // Suddenly ends the current action. -BOOL CTaskManager::Abort() +bool CTaskManager::Abort() { - if ( m_task == 0 ) return FALSE; + if ( m_task == 0 ) return false; return m_task->Abort(); } diff --git a/src/object/task/taskmanager.h b/src/object/task/taskmanager.h index 8c7e093..476e90f 100644 --- a/src/object/task/taskmanager.h +++ b/src/object/task/taskmanager.h @@ -47,9 +47,9 @@ public: Error StartTaskFlag(TaskFlagOrder order, int rank); Error StartTaskBuild(ObjectType type); Error StartTaskSearch(); - Error StartTaskInfo(char *name, float value, float power, BOOL bSend); + Error StartTaskInfo(char *name, float value, float power, bool bSend); Error StartTaskTerraform(); - Error StartTaskPen(BOOL bDown, int color); + Error StartTaskPen(bool bDown, int color); Error StartTaskRecover(); Error StartTaskShield(TaskShieldMode mode, float delay); Error StartTaskFire(float delay); @@ -58,11 +58,11 @@ public: Error StartTaskSpiderExplo(); Error StartTaskReset(D3DVECTOR goal, D3DVECTOR angle); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error IsEnded(); - BOOL IsBusy(); - BOOL IsPilot(); - BOOL Abort(); + bool IsBusy(); + bool IsPilot(); + bool Abort(); protected: @@ -70,6 +70,6 @@ protected: CInstanceManager* m_iMan; CTask* m_task; CObject* m_object; - BOOL m_bPilot; + bool m_bPilot; }; diff --git a/src/object/task/taskmanip.cpp b/src/object/task/taskmanip.cpp index 90dc016..5df067c 100644 --- a/src/object/task/taskmanip.cpp +++ b/src/object/task/taskmanip.cpp @@ -59,8 +59,6 @@ CTaskManip::CTaskManip(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); - m_arm = TMA_NEUTRAL; m_hand = TMH_OPEN; } @@ -74,19 +72,19 @@ CTaskManip::~CTaskManip() // Management of an event. -BOOL CTaskManip::EventProcess(const Event &event) +bool CTaskManip::EventProcess(const Event &event) { D3DVECTOR pos; float angle, a, g, cirSpeed, progress; int i; - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; - if ( m_bError ) return FALSE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; + if ( m_bError ) return false; if ( m_bBee ) // bee? { - return TRUE; + return true; } if ( m_bTurn ) // preliminary rotation? @@ -102,14 +100,14 @@ BOOL CTaskManip::EventProcess(const Event &event) if ( cirSpeed < -1.0f ) cirSpeed = -1.0f; m_physics->SetMotorSpeedZ(cirSpeed); // turns left / right - return TRUE; + return true; } if ( m_move != 0 ) // preliminary advance? { m_timeLimit -= event.rTime; m_physics->SetMotorSpeedX(m_move); // forward/backward - return TRUE; + return true; } m_progress += event.rTime*m_speed; // others advance @@ -179,7 +177,7 @@ BOOL CTaskManip::EventProcess(const Event &event) } } - return TRUE; + return true; } @@ -280,7 +278,7 @@ void CTaskManip::InitAngle() // Tests whether an object is compatible with the operation TMA_OTHER. -BOOL TestFriend(ObjectType oType, ObjectType fType) +bool TestFriend(ObjectType oType, ObjectType fType) { if ( oType == OBJECT_ENERGY ) { @@ -320,7 +318,7 @@ Error CTaskManip::Start(TaskManipOrder order, TaskManipArm arm) iAngle = NormAngle(iAngle); // 0..2*PI oAngle = iAngle; - m_bError = TRUE; // operation impossible + m_bError = true; // operation impossible if ( m_arm != TMA_FFRONT && m_arm != TMA_FBACK && @@ -360,11 +358,11 @@ Error CTaskManip::Start(TaskManipOrder order, TaskManipArm arm) pyro->Create(PT_FALL, other); // the ball falls } - m_bBee = TRUE; - m_bError = FALSE; // ok + m_bBee = true; + m_bError = false; // ok return ERR_OK; } - m_bBee = FALSE; + m_bBee = false; m_bSubm = ( type == OBJECT_MOBILEsa ); // submarine? @@ -431,8 +429,8 @@ Error CTaskManip::Start(TaskManipOrder order, TaskManipArm arm) { if ( m_arm == TMA_FFRONT ) { - front = SearchTakeFrontObject(TRUE, fPos, fDist, fAngle); - other = SearchOtherObject(TRUE, oPos, oDist, oAngle, oHeight); + front = SearchTakeFrontObject(true, fPos, fDist, fAngle); + other = SearchOtherObject(true, oPos, oDist, oAngle, oHeight); if ( front != 0 && fDist < oDist ) { @@ -457,7 +455,7 @@ Error CTaskManip::Start(TaskManipOrder order, TaskManipArm arm) } if ( m_arm == TMA_FBACK ) { - if ( SearchTakeBackObject(TRUE, m_targetPos, fDist, m_angle) == 0 ) + if ( SearchTakeBackObject(true, m_targetPos, fDist, m_angle) == 0 ) { return ERR_MANIP_NIL; } @@ -474,7 +472,7 @@ Error CTaskManip::Start(TaskManipOrder order, TaskManipArm arm) { if ( m_arm == TMA_FFRONT ) { - other = SearchOtherObject(TRUE, oPos, oDist, oAngle, oHeight); + other = SearchOtherObject(true, oPos, oDist, oAngle, oHeight); if ( other != 0 && other->RetPower() == 0 ) { m_targetPos = oPos; @@ -527,12 +525,12 @@ Error CTaskManip::Start(TaskManipOrder order, TaskManipArm arm) if ( iAngle == m_angle || m_energy == 0.0f ) { - m_bTurn = FALSE; // preliminary rotation unnecessary + m_bTurn = false; // preliminary rotation unnecessary SoundManip(1.0f/m_speed); } else { - m_bTurn = TRUE; // preliminary rotation necessary + m_bTurn = true; // preliminary rotation necessary } if ( m_bSubm ) @@ -540,9 +538,9 @@ Error CTaskManip::Start(TaskManipOrder order, TaskManipArm arm) m_camera->StartCentering(m_object, PI*0.8f, 99.9f, 0.0f, 0.5f); } - m_physics->SetFreeze(TRUE); // it does not move + m_physics->SetFreeze(true); // it does not move - m_bError = FALSE; // ok + m_bError = false; // ok return ERR_OK; } @@ -570,7 +568,7 @@ Error CTaskManip::IsEnded() if ( TestAngle(angle, m_angle-PI*0.01f, m_angle+PI*0.01f) ) { - m_bTurn = FALSE; // rotation ended + m_bTurn = false; // rotation ended m_physics->SetMotorSpeedZ(0.0f); if ( m_move == 0.0f ) { @@ -704,7 +702,7 @@ Error CTaskManip::IsEnded() // Suddenly ends the current action. -BOOL CTaskManip::Abort() +bool CTaskManip::Abort() { int i; @@ -729,8 +727,8 @@ BOOL CTaskManip::Abort() } m_camera->StopCentering(m_object, 2.0f); - m_physics->SetFreeze(FALSE); // is moving again - return TRUE; + m_physics->SetFreeze(false); // is moving again + return true; } @@ -791,7 +789,7 @@ CObject* CTaskManip::SearchTakeUnderObject(D3DVECTOR &pos, float dLimit) // Seeks the object in front to take. -CObject* CTaskManip::SearchTakeFrontObject(BOOL bAdvance, D3DVECTOR &pos, +CObject* CTaskManip::SearchTakeFrontObject(bool bAdvance, D3DVECTOR &pos, float &distance, float &angle) { CObject *pObj, *pBest; @@ -883,7 +881,7 @@ CObject* CTaskManip::SearchTakeFrontObject(BOOL bAdvance, D3DVECTOR &pos, // Seeks the object back to take. -CObject* CTaskManip::SearchTakeBackObject(BOOL bAdvance, D3DVECTOR &pos, +CObject* CTaskManip::SearchTakeBackObject(bool bAdvance, D3DVECTOR &pos, float &distance, float &angle) { CObject *pObj, *pBest; @@ -974,7 +972,7 @@ CObject* CTaskManip::SearchTakeBackObject(BOOL bAdvance, D3DVECTOR &pos, // Seeks the robot or building on which it wants to put a battery or or other object. -CObject* CTaskManip::SearchOtherObject(BOOL bAdvance, D3DVECTOR &pos, +CObject* CTaskManip::SearchOtherObject(bool bAdvance, D3DVECTOR &pos, float &distance, float &angle, float &height) { @@ -1110,7 +1108,7 @@ CObject* CTaskManip::SearchOtherObject(BOOL bAdvance, D3DVECTOR &pos, // Takes the object placed in front. -BOOL CTaskManip::TruckTakeObject() +bool CTaskManip::TruckTakeObject() { CObject* fret; CObject* other; @@ -1121,7 +1119,7 @@ BOOL CTaskManip::TruckTakeObject() if ( m_arm == TMA_GRAB ) // takes immediately? { fret = m_object->RetFret(); - if ( fret == 0 ) return FALSE; // nothing to take? + if ( fret == 0 ) return false; // nothing to take? m_fretType = fret->RetType(); if ( m_object->RetType() == OBJECT_HUMAN || @@ -1163,8 +1161,8 @@ BOOL CTaskManip::TruckTakeObject() if ( m_arm == TMA_FFRONT ) // takes on the ground in front? { - fret = SearchTakeFrontObject(FALSE, pos, dist, angle); - if ( fret == 0 ) return FALSE; // nothing to take? + fret = SearchTakeFrontObject(false, pos, dist, angle); + if ( fret == 0 ) return false; // nothing to take? m_fretType = fret->RetType(); if ( m_bSubm ) @@ -1195,8 +1193,8 @@ BOOL CTaskManip::TruckTakeObject() if ( m_arm == TMA_FBACK ) // takes on the ground behind? { - fret = SearchTakeBackObject(FALSE, pos, dist, angle); - if ( fret == 0 ) return FALSE; // nothing to take? + fret = SearchTakeBackObject(false, pos, dist, angle); + if ( fret == 0 ) return false; // nothing to take? m_fretType = fret->RetType(); fret->SetTruck(m_object); @@ -1214,7 +1212,7 @@ BOOL CTaskManip::TruckTakeObject() if ( m_arm == TMA_POWER ) // takes battery in the back? { fret = m_object->RetPower(); - if ( fret == 0 ) return FALSE; // no battery? + if ( fret == 0 ) return false; // no battery? m_fretType = fret->RetType(); pos = D3DVECTOR(4.7f, 0.0f, 0.0f); // relative to the hand (lem4) @@ -1230,11 +1228,11 @@ BOOL CTaskManip::TruckTakeObject() if ( m_arm == TMA_OTHER ) // battery takes from friend? { - other = SearchOtherObject(FALSE, pos, dist, angle, m_height); - if ( other == 0 ) return FALSE; + other = SearchOtherObject(false, pos, dist, angle, m_height); + if ( other == 0 ) return false; fret = other->RetPower(); - if ( fret == 0 ) return FALSE; // the other does not have a battery? + if ( fret == 0 ) return false; // the other does not have a battery? m_fretType = fret->RetType(); other->SetPower(0); @@ -1250,12 +1248,12 @@ BOOL CTaskManip::TruckTakeObject() m_object->SetFret(fret); // takes } - return TRUE; + return true; } // Deposes the object taken. -BOOL CTaskManip::TruckDeposeObject() +bool CTaskManip::TruckDeposeObject() { Character* character; CObject* fret; @@ -1267,7 +1265,7 @@ BOOL CTaskManip::TruckDeposeObject() if ( m_arm == TMA_FFRONT ) // deposits on the ground in front? { fret = m_object->RetFret(); - if ( fret == 0 ) return FALSE; // nothing transported? + if ( fret == 0 ) return false; // nothing transported? m_fretType = fret->RetType(); mat = fret->RetWorldMatrix(0); @@ -1286,7 +1284,7 @@ BOOL CTaskManip::TruckDeposeObject() if ( m_arm == TMA_FBACK ) // deposited on the ground behind? { fret = m_object->RetFret(); - if ( fret == 0 ) return FALSE; // nothing transported? + if ( fret == 0 ) return false; // nothing transported? m_fretType = fret->RetType(); mat = fret->RetWorldMatrix(0); @@ -1304,10 +1302,10 @@ BOOL CTaskManip::TruckDeposeObject() if ( m_arm == TMA_POWER ) // deposits battery in the back? { fret = m_object->RetFret(); - if ( fret == 0 ) return FALSE; // nothing transported? + if ( fret == 0 ) return false; // nothing transported? m_fretType = fret->RetType(); - if ( m_object->RetPower() != 0 ) return FALSE; + if ( m_object->RetPower() != 0 ) return false; fret->SetTruck(m_object); fret->SetTruckPart(0); // carried by the base @@ -1324,14 +1322,14 @@ BOOL CTaskManip::TruckDeposeObject() if ( m_arm == TMA_OTHER ) // deposits battery on friend? { - other = SearchOtherObject(FALSE, pos, dist, angle, m_height); - if ( other == 0 ) return FALSE; + other = SearchOtherObject(false, pos, dist, angle, m_height); + if ( other == 0 ) return false; fret = other->RetPower(); - if ( fret != 0 ) return FALSE; // the other already has a battery? + if ( fret != 0 ) return false; // the other already has a battery? fret = m_object->RetFret(); - if ( fret == 0 ) return FALSE; + if ( fret == 0 ) return false; m_fretType = fret->RetType(); other->SetPower(fret); @@ -1347,12 +1345,12 @@ BOOL CTaskManip::TruckDeposeObject() m_object->SetFret(0); // deposit } - return TRUE; + return true; } // Seeks if a location allows to deposit an object. -BOOL CTaskManip::IsFreeDeposeObject(D3DVECTOR pos) +bool CTaskManip::IsFreeDeposeObject(D3DVECTOR pos) { CObject* pObj; D3DMATRIX* mat; @@ -1377,11 +1375,11 @@ BOOL CTaskManip::IsFreeDeposeObject(D3DVECTOR pos) { if ( Length(iPos, oPos)-(oRadius+1.0f) < 2.0f ) { - return FALSE; // location occupied + return false; // location occupied } } } - return TRUE; // location free + return true; // location free } // Plays the sound of the manipulator arm. @@ -1390,7 +1388,7 @@ void CTaskManip::SoundManip(float time, float amplitude, float frequency) { int i; - i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f*frequency, TRUE); + i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f*frequency, true); m_sound->AddEnvelope(i, 0.5f*amplitude, 1.0f*frequency, 0.1f, SOPER_CONTINUE); m_sound->AddEnvelope(i, 0.5f*amplitude, 1.0f*frequency, time-0.1f, SOPER_CONTINUE); m_sound->AddEnvelope(i, 0.0f, 0.3f*frequency, 0.1f, SOPER_STOP); diff --git a/src/object/task/taskmanip.h b/src/object/task/taskmanip.h index db25dd3..b2c8c29 100644 --- a/src/object/task/taskmanip.h +++ b/src/object/task/taskmanip.h @@ -64,21 +64,21 @@ public: CTaskManip(CInstanceManager* iMan, CObject* object); ~CTaskManip(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(TaskManipOrder order, TaskManipArm arm); Error IsEnded(); - BOOL Abort(); + bool Abort(); protected: void InitAngle(); CObject* SearchTakeUnderObject(D3DVECTOR &pos, float dLimit); - CObject* SearchTakeFrontObject(BOOL bAdvance, D3DVECTOR &pos, float &distance, float &angle); - CObject* SearchTakeBackObject(BOOL bAdvance, D3DVECTOR &pos, float &distance, float &angle); - CObject* SearchOtherObject(BOOL bAdvance, D3DVECTOR &pos, float &distance, float &angle, float &height); - BOOL TruckTakeObject(); - BOOL TruckDeposeObject(); - BOOL IsFreeDeposeObject(D3DVECTOR pos); + CObject* SearchTakeFrontObject(bool bAdvance, D3DVECTOR &pos, float &distance, float &angle); + CObject* SearchTakeBackObject(bool bAdvance, D3DVECTOR &pos, float &distance, float &angle); + CObject* SearchOtherObject(bool bAdvance, D3DVECTOR &pos, float &distance, float &angle, float &height); + bool TruckTakeObject(); + bool TruckDeposeObject(); + bool IsFreeDeposeObject(D3DVECTOR pos); void SoundManip(float time, float amplitude=1.0f, float frequency=1.0f); protected: @@ -93,10 +93,10 @@ protected: float m_height; float m_advanceLength; float m_energy; - BOOL m_bError; - BOOL m_bTurn; - BOOL m_bSubm; - BOOL m_bBee; + bool m_bError; + bool m_bTurn; + bool m_bSubm; + bool m_bBee; float m_angle; float m_move; D3DVECTOR m_targetPos; diff --git a/src/object/task/taskpen.cpp b/src/object/task/taskpen.cpp index 267c221..bd88b26 100644 --- a/src/object/task/taskpen.cpp +++ b/src/object/task/taskpen.cpp @@ -48,7 +48,6 @@ CTaskPen::CTaskPen(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); } // Object's destructor. @@ -60,15 +59,15 @@ CTaskPen::~CTaskPen() // Management of an event. -BOOL CTaskPen::EventProcess(const Event &event) +bool CTaskPen::EventProcess(const Event &event) { D3DVECTOR pos, speed; FPOINT dim; int i; - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; - if ( m_bError ) return FALSE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; + if ( m_bError ) return false; if ( m_delay == 0.0f ) { @@ -140,25 +139,25 @@ BOOL CTaskPen::EventProcess(const Event &event) m_object->SetPosition(10+i, pos); } - return TRUE; + return true; } // Assigns the goal has achieved. -Error CTaskPen::Start(BOOL bDown, int color) +Error CTaskPen::Start(bool bDown, int color) { D3DVECTOR pos; D3DMATRIX* mat; ObjectType type; int i; - m_bError = TRUE; // operation impossible + m_bError = true; // operation impossible type = m_object->RetType(); if ( type != OBJECT_MOBILEdr ) return ERR_FIRE_VEH; - m_bError = FALSE; // ok + m_bError = false; // ok m_oldAngle = m_object->RetAngleY(1); m_newAngle = ColorToAngle(color); @@ -247,10 +246,10 @@ Error CTaskPen::IsEnded() // Suddenly ends the current action. -BOOL CTaskPen::Abort() +bool CTaskPen::Abort() { //? m_camera->StopCentering(m_object, 0.5f); - return TRUE; + return true; } @@ -260,7 +259,7 @@ void CTaskPen::SoundManip(float time, float amplitude, float frequency) { int i; - i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f*frequency, TRUE); + i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f*frequency, true); m_sound->AddEnvelope(i, 0.5f*amplitude, 1.0f*frequency, 0.1f, SOPER_CONTINUE); m_sound->AddEnvelope(i, 0.5f*amplitude, 1.0f*frequency, time-0.1f, SOPER_CONTINUE); m_sound->AddEnvelope(i, 0.0f, 0.3f*frequency, 0.1f, SOPER_STOP); diff --git a/src/object/task/taskpen.h b/src/object/task/taskpen.h index 4beb9ac..2f1f270 100644 --- a/src/object/task/taskpen.h +++ b/src/object/task/taskpen.h @@ -45,11 +45,11 @@ public: CTaskPen(CInstanceManager* iMan, CObject* object); ~CTaskPen(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); - Error Start(BOOL bDown, int color); + Error Start(bool bDown, int color); Error IsEnded(); - BOOL Abort(); + bool Abort(); protected: void SoundManip(float time, float amplitude, float frequency); @@ -58,7 +58,7 @@ protected: int ColorToRank(int color); protected: - BOOL m_bError; + bool m_bError; TaskPenPhase m_phase; float m_progress; float m_delay; diff --git a/src/object/task/taskrecover.cpp b/src/object/task/taskrecover.cpp index 070d429..798540b 100644 --- a/src/object/task/taskrecover.cpp +++ b/src/object/task/taskrecover.cpp @@ -50,8 +50,6 @@ CTaskRecover::CTaskRecover(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); - m_ruin = 0; m_soundChannel = -1; } @@ -65,16 +63,16 @@ CTaskRecover::~CTaskRecover() // Management of an event. -BOOL CTaskRecover::EventProcess(const Event &event) +bool CTaskRecover::EventProcess(const Event &event) { CObject* power; D3DVECTOR pos, speed; FPOINT dim; float a, g, cirSpeed, angle, energy, dist, linSpeed; - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; - if ( m_bError ) return FALSE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; + if ( m_bError ) return false; if ( m_phase == TRP_TURN ) // preliminary rotation? { @@ -85,7 +83,7 @@ BOOL CTaskRecover::EventProcess(const Event &event) if ( cirSpeed < -1.0f ) cirSpeed = -1.0f; m_physics->SetMotorSpeedZ(cirSpeed); // turns left / right - return TRUE; + return true; } m_progress += event.rTime*m_speed; // others advance @@ -109,7 +107,7 @@ BOOL CTaskRecover::EventProcess(const Event &event) if ( dist > RECOVER_DIST ) linSpeed = 1.0f; if ( dist < RECOVER_DIST ) linSpeed = -1.0f; m_physics->SetMotorSpeedX(linSpeed); // forward/backward - return TRUE; + return true; } if ( m_phase == TRP_OPER ) @@ -178,7 +176,7 @@ BOOL CTaskRecover::EventProcess(const Event &event) } } - return TRUE; + return true; } @@ -193,7 +191,7 @@ Error CTaskRecover::Start() ObjectType type; - m_bError = TRUE; // operation impossible + m_bError = true; // operation impossible if ( !m_physics->RetLand() ) return ERR_RECOVER_VEH; type = m_object->RetType(); @@ -211,7 +209,7 @@ Error CTaskRecover::Start() m_ruin = SearchRuin(); if ( m_ruin == 0 ) return ERR_RECOVER_NULL; - m_ruin->SetLock(TRUE); // ruin no longer usable + m_ruin->SetLock(true); // ruin no longer usable iPos = m_object->RetPosition(0); oPos = m_ruin->RetPosition(0); @@ -225,7 +223,7 @@ Error CTaskRecover::Start() m_time = 0.0f; m_lastParticule = 0.0f; - m_bError = FALSE; // ok + m_bError = false; // ok m_camera->StartCentering(m_object, PI*0.85f, 99.9f, 10.0f, 3.0f); return ERR_OK; @@ -284,7 +282,7 @@ Error CTaskRecover::IsEnded() pos = Transform(*mat, pos); // position in front m_recoverPos = pos; - i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.9f, TRUE); + i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.9f, true); m_sound->AddEnvelope(i, 1.0f, 1.5f, 0.3f, SOPER_CONTINUE); m_sound->AddEnvelope(i, 1.0f, 1.5f, 1.0f, SOPER_CONTINUE); m_sound->AddEnvelope(i, 0.0f, 0.9f, 0.3f, SOPER_STOP); @@ -298,7 +296,7 @@ Error CTaskRecover::IsEnded() { if ( m_progress > 1.0f ) // timeout? { - m_ruin->SetLock(FALSE); // usable again + m_ruin->SetLock(false); // usable again m_camera->StopCentering(m_object, 2.0f); return ERR_RECOVER_NULL; } @@ -317,11 +315,11 @@ Error CTaskRecover::IsEnded() delete m_metal; m_metal = 0; Abort(); - m_bError = TRUE; + m_bError = true; m_displayText->DisplayError(ERR_TOOMANY, m_object); return ERR_STOP; } - m_metal->SetLock(TRUE); // metal not yet usable + m_metal->SetLock(true); // metal not yet usable m_metal->SetZoom(0, 0.0f); mat = m_object->RetWorldMatrix(0); @@ -332,7 +330,7 @@ Error CTaskRecover::IsEnded() m_particule->CreateRay(pos, goal, PARTIRAY2, FPOINT(2.0f, 2.0f), 8.0f); - m_soundChannel = m_sound->Play(SOUND_RECOVER, m_ruin->RetPosition(0), 0.0f, 1.0f, TRUE); + m_soundChannel = m_sound->Play(SOUND_RECOVER, m_ruin->RetPosition(0), 0.0f, 1.0f, true); m_sound->AddEnvelope(m_soundChannel, 0.6f, 1.0f, 2.0f, SOPER_CONTINUE); m_sound->AddEnvelope(m_soundChannel, 0.6f, 1.0f, 4.0f, SOPER_CONTINUE); m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.7f, 2.0f, SOPER_STOP); @@ -352,7 +350,7 @@ Error CTaskRecover::IsEnded() m_soundChannel = -1; - i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.9f, TRUE); + i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.9f, true); m_sound->AddEnvelope(i, 1.0f, 1.5f, 0.3f, SOPER_CONTINUE); m_sound->AddEnvelope(i, 1.0f, 1.5f, 1.0f, SOPER_CONTINUE); m_sound->AddEnvelope(i, 0.0f, 0.9f, 0.3f, SOPER_STOP); @@ -362,7 +360,7 @@ Error CTaskRecover::IsEnded() return ERR_CONTINUE; } - m_metal->SetLock(FALSE); // metal usable + m_metal->SetLock(false); // metal usable Abort(); return ERR_STOP; @@ -370,7 +368,7 @@ Error CTaskRecover::IsEnded() // Suddenly ends the current action. -BOOL CTaskRecover::Abort() +bool CTaskRecover::Abort() { m_object->SetAngleZ(2, 126.0f*PI/180.0f); m_object->SetAngleZ(4, 126.0f*PI/180.0f); @@ -385,7 +383,7 @@ BOOL CTaskRecover::Abort() } m_camera->StopCentering(m_object, 2.0f); - return TRUE; + return true; } diff --git a/src/object/task/taskrecover.h b/src/object/task/taskrecover.h index d8625ad..87efc07 100644 --- a/src/object/task/taskrecover.h +++ b/src/object/task/taskrecover.h @@ -47,11 +47,11 @@ public: CTaskRecover(CInstanceManager* iMan, CObject* object); ~CTaskRecover(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(); Error IsEnded(); - BOOL Abort(); + bool Abort(); protected: CObject* SearchRuin(); @@ -63,7 +63,7 @@ protected: float m_time; float m_angle; float m_lastParticule; - BOOL m_bError; + bool m_bError; CObject* m_ruin; CObject* m_metal; D3DVECTOR m_recoverPos; diff --git a/src/object/task/taskreset.cpp b/src/object/task/taskreset.cpp index 5616c0c..1b7ff95 100644 --- a/src/object/task/taskreset.cpp +++ b/src/object/task/taskreset.cpp @@ -52,7 +52,6 @@ CTaskReset::CTaskReset(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); } // Object's destructor. @@ -64,15 +63,15 @@ CTaskReset::~CTaskReset() // Management of an event. -BOOL CTaskReset::EventProcess(const Event &event) +bool CTaskReset::EventProcess(const Event &event) { D3DVECTOR pos, speed; FPOINT dim; float angle, duration; - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; - if ( m_bError ) return FALSE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; + if ( m_bError ) return false; m_time += event.rTime; m_progress += event.rTime*m_speed; @@ -171,7 +170,7 @@ BOOL CTaskReset::EventProcess(const Event &event) } } - return TRUE; + return true; } @@ -196,7 +195,7 @@ Error CTaskReset::Start(D3DVECTOR goal, D3DVECTOR angle) m_object->SetAngle(0, angle); m_brain->RunProgram(m_object->RetResetRun()); - m_bError = FALSE; + m_bError = false; return ERR_OK; } @@ -206,7 +205,7 @@ Error CTaskReset::Start(D3DVECTOR goal, D3DVECTOR angle) if ( SearchVehicle() ) // starting location occupied? { - m_bError = TRUE; + m_bError = true; return ERR_RESET_NEAR; } @@ -217,12 +216,12 @@ Error CTaskReset::Start(D3DVECTOR goal, D3DVECTOR angle) m_progress = 0.0f; m_lastParticule = 0.0f; - m_object->SetResetBusy(TRUE); + m_object->SetResetBusy(true); - i = m_sound->Play(SOUND_GGG, m_begin, 1.0f, 2.0f, TRUE); + i = m_sound->Play(SOUND_GGG, m_begin, 1.0f, 2.0f, true); m_sound->AddEnvelope(i, 0.0f, 0.5f, RESET_DELAY_ZOOM, SOPER_STOP); - m_bError = FALSE; + m_bError = false; return ERR_OK; } @@ -257,7 +256,7 @@ Error CTaskReset::IsEnded() m_object->SetPosition(0, m_goal); m_object->SetAngle(0, m_angle); - i = m_sound->Play(SOUND_GGG, m_goal, 1.0f, 0.5f, TRUE); + i = m_sound->Play(SOUND_GGG, m_goal, 1.0f, 0.5f, true); m_sound->AddEnvelope(i, 0.0f, 2.0f, RESET_DELAY_ZOOM, SOPER_STOP); m_phase = TRSP_ZIN; @@ -276,14 +275,14 @@ Error CTaskReset::IsEnded() } m_brain->RunProgram(m_object->RetResetRun()); - m_object->SetResetBusy(FALSE); + m_object->SetResetBusy(false); return ERR_STOP; } // Seeks if a vehicle is too close. -BOOL CTaskReset::SearchVehicle() +bool CTaskReset::SearchVehicle() { CObject* pObj; D3DVECTOR oPos; @@ -337,9 +336,9 @@ BOOL CTaskReset::SearchVehicle() if ( !pObj->GetCrashSphere(0, oPos, oRadius) ) continue; dist = Length(oPos, m_goal)-oRadius; - if ( dist < 5.0f ) return TRUE; + if ( dist < 5.0f ) return true; } - return FALSE; + return false; } diff --git a/src/object/task/taskreset.h b/src/object/task/taskreset.h index 6665bce..4ebc032 100644 --- a/src/object/task/taskreset.h +++ b/src/object/task/taskreset.h @@ -46,13 +46,13 @@ public: CTaskReset(CInstanceManager* iMan, CObject* object); ~CTaskReset(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(D3DVECTOR goal, D3DVECTOR angle); Error IsEnded(); protected: - BOOL SearchVehicle(); + bool SearchVehicle(); protected: D3DVECTOR m_begin; @@ -60,7 +60,7 @@ protected: D3DVECTOR m_angle; TaskResetPhase m_phase; - BOOL m_bError; + bool m_bError; float m_time; float m_speed; float m_progress; diff --git a/src/object/task/tasksearch.cpp b/src/object/task/tasksearch.cpp index 7007691..f182250 100644 --- a/src/object/task/tasksearch.cpp +++ b/src/object/task/tasksearch.cpp @@ -47,8 +47,6 @@ CTaskSearch::CTaskSearch(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); - m_hand = TSH_UP; } @@ -61,7 +59,7 @@ CTaskSearch::~CTaskSearch() // Management of an event. -BOOL CTaskSearch::EventProcess(const Event &event) +bool CTaskSearch::EventProcess(const Event &event) { D3DMATRIX* mat; D3DVECTOR pos, speed; @@ -69,9 +67,9 @@ BOOL CTaskSearch::EventProcess(const Event &event) float angle; int i; - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; - if ( m_bError ) return FALSE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; + if ( m_bError ) return false; m_progress += event.rTime*m_speed; // others advance m_time += event.rTime; @@ -104,7 +102,7 @@ BOOL CTaskSearch::EventProcess(const Event &event) m_particule->CreateParticule(pos, speed, dim, PARTIGAS); } - return TRUE; + return true; } @@ -142,7 +140,7 @@ Error CTaskSearch::Start() D3DVECTOR speed; int i; - m_bError = TRUE; + m_bError = true; if ( !m_physics->RetLand() ) return ERR_SEARCH_FLY; speed = m_physics->RetMotorSpeed(); @@ -163,16 +161,16 @@ Error CTaskSearch::Start() m_lastParticule = 0.0f; InitAngle(); - m_bError = FALSE; // ok + m_bError = false; // ok m_camera->StartCentering(m_object, PI*0.50f, 99.9f, 0.0f, 1.0f); - i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f, TRUE); + i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f, true); m_sound->AddEnvelope(i, 0.5f, 1.0f, 0.1f, SOPER_CONTINUE); m_sound->AddEnvelope(i, 0.5f, 1.0f, 0.9f, SOPER_CONTINUE); m_sound->AddEnvelope(i, 0.0f, 0.3f, 0.1f, SOPER_STOP); - m_physics->SetFreeze(TRUE); // it does not move + m_physics->SetFreeze(true); // it does not move return ERR_OK; } @@ -214,7 +212,7 @@ Error CTaskSearch::IsEnded() m_hand = TSH_UP; InitAngle(); - i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f, TRUE); + i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f, true); m_sound->AddEnvelope(i, 0.5f, 1.0f, 0.1f, SOPER_CONTINUE); m_sound->AddEnvelope(i, 0.5f, 1.0f, 0.9f, SOPER_CONTINUE); m_sound->AddEnvelope(i, 0.0f, 0.3f, 0.1f, SOPER_STOP); @@ -230,17 +228,17 @@ Error CTaskSearch::IsEnded() // Suddenly ends the current action. -BOOL CTaskSearch::Abort() +bool CTaskSearch::Abort() { m_camera->StopCentering(m_object, 2.0f); - m_physics->SetFreeze(FALSE); // is moving again - return TRUE; + m_physics->SetFreeze(false); // is moving again + return true; } // Creates a mark if possible. -BOOL CTaskSearch::CreateMark() +bool CTaskSearch::CreateMark() { CObject* fret; ObjectType type; @@ -254,7 +252,7 @@ BOOL CTaskSearch::CreateMark() pos = Transform(*mat, pos); // sensor position res = m_terrain->RetResource(pos); - if ( res == TR_NULL ) return FALSE; + if ( res == TR_NULL ) return false; type = OBJECT_NULL; if ( res == TR_STONE ) @@ -292,7 +290,7 @@ BOOL CTaskSearch::CreateMark() type = OBJECT_MARKKEYd; info = INFO_MARKKEYd; } - if ( type == OBJECT_NULL ) return FALSE; + if ( type == OBJECT_NULL ) return false; //? DeleteMark(type); @@ -301,12 +299,12 @@ BOOL CTaskSearch::CreateMark() { delete fret; m_displayText->DisplayError(ERR_TOOMANY, m_object); - return FALSE; + return false; } m_displayText->DisplayError(info, pos, 5.0f, 50.0f); // displays the message - return TRUE; + return true; } // Destroys the marks of a given type. diff --git a/src/object/task/tasksearch.h b/src/object/task/tasksearch.h index 18254cc..48b1a32 100644 --- a/src/object/task/tasksearch.h +++ b/src/object/task/tasksearch.h @@ -51,15 +51,15 @@ public: CTaskSearch(CInstanceManager* iMan, CObject* object); ~CTaskSearch(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(); Error IsEnded(); - BOOL Abort(); + bool Abort(); protected: void InitAngle(); - BOOL CreateMark(); + bool CreateMark(); void DeleteMark(ObjectType type); protected: @@ -71,6 +71,6 @@ protected: float m_lastParticule; float m_initialAngle[3]; float m_finalAngle[3]; - BOOL m_bError; + bool m_bError; }; diff --git a/src/object/task/taskshield.cpp b/src/object/task/taskshield.cpp index 03cc571..818a3a7 100644 --- a/src/object/task/taskshield.cpp +++ b/src/object/task/taskshield.cpp @@ -50,8 +50,6 @@ CTaskShield::CTaskShield(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); - m_rankSphere = -1; m_soundChannel = -1; m_effectLight = -1; @@ -67,7 +65,7 @@ CTaskShield::~CTaskShield() // Management of an event. -BOOL CTaskShield::EventProcess(const Event &event) +bool CTaskShield::EventProcess(const Event &event) { CObject* power; D3DMATRIX* mat; @@ -77,9 +75,9 @@ BOOL CTaskShield::EventProcess(const Event &event) FPOINT dim; float energy; - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; - if ( m_bError ) return FALSE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; + if ( m_bError ) return false; m_progress += event.rTime*m_speed; // others advance m_time += event.rTime; @@ -127,7 +125,7 @@ BOOL CTaskShield::EventProcess(const Event &event) if ( m_soundChannel == -1 ) { - m_soundChannel = m_sound->Play(SOUND_SHIELD, m_shieldPos, 0.5f, 0.5f, TRUE); + m_soundChannel = m_sound->Play(SOUND_SHIELD, m_shieldPos, 0.5f, 0.5f, true); m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.0f, 2.0f, SOPER_CONTINUE); m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.0f, 1.0f, SOPER_LOOP); } @@ -232,7 +230,7 @@ BOOL CTaskShield::EventProcess(const Event &event) m_object->SetPosition(2, pos); } - return TRUE; + return true; } @@ -264,7 +262,7 @@ Error CTaskShield::Start(TaskShieldMode mode, float delay) type = m_object->RetType(); if ( type != OBJECT_MOBILErs ) return ERR_SHIELD_VEH; - m_bError = TRUE; // operation impossible + m_bError = true; // operation impossible if ( !m_physics->RetLand() ) return ERR_SHIELD_VEH; power = m_object->RetPower(); @@ -289,7 +287,7 @@ Error CTaskShield::Start(TaskShieldMode mode, float delay) m_lastIncrease = 0.0f; m_energyUsed = 0.0f; - m_bError = FALSE; // ok + m_bError = false; // ok if ( m_object->RetSelect() ) { @@ -439,19 +437,19 @@ Error CTaskShield::IsEnded() // Indicates whether the action is pending. -BOOL CTaskShield::IsBusy() +bool CTaskShield::IsBusy() { if ( m_phase == TS_SHIELD ) { - return FALSE; + return false; } - return TRUE; + return true; } // Suddenly ends the current action. -BOOL CTaskShield::Abort() +bool CTaskShield::Abort() { D3DVECTOR pos; @@ -487,17 +485,17 @@ BOOL CTaskShield::Abort() } m_camera->StopCentering(m_object, 2.0f); - return TRUE; + return true; } // Creates the light to accompany a pyrotechnic effect. -BOOL CTaskShield::CreateLight(D3DVECTOR pos) +bool CTaskShield::CreateLight(D3DVECTOR pos) { D3DLIGHT7 light; - if ( !m_engine->RetLightMode() ) return TRUE; + if ( !m_engine->RetLightMode() ) return true; ZeroMemory( &light, sizeof(light) ); light.dltType = D3DLIGHT_SPOT; @@ -519,12 +517,12 @@ BOOL CTaskShield::CreateLight(D3DVECTOR pos) light.dvPhi = PI/4.0f; m_effectLight = m_light->CreateLight(); - if ( m_effectLight == -1 ) return FALSE; + if ( m_effectLight == -1 ) return false; m_light->SetLight(m_effectLight, light); m_light->SetLightIntensity(m_effectLight, 1.0f); - return TRUE; + return true; } diff --git a/src/object/task/taskshield.h b/src/object/task/taskshield.h index 6fa1540..e78466e 100644 --- a/src/object/task/taskshield.h +++ b/src/object/task/taskshield.h @@ -59,16 +59,16 @@ public: CTaskShield(CInstanceManager* iMan, CObject* object); ~CTaskShield(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(TaskShieldMode mode, float delay); Error IsEnded(); - BOOL IsBusy(); - BOOL Abort(); + bool IsBusy(); + bool Abort(); protected: Error Stop(); - BOOL CreateLight(D3DVECTOR pos); + bool CreateLight(D3DVECTOR pos); void IncreaseShield(); float RetRadius(); @@ -82,7 +82,7 @@ protected: float m_lastRay; float m_lastIncrease; float m_energyUsed; - BOOL m_bError; + bool m_bError; D3DVECTOR m_shieldPos; int m_rankSphere; int m_soundChannel; diff --git a/src/object/task/taskspiderexplo.cpp b/src/object/task/taskspiderexplo.cpp index 2f7717c..496916c 100644 --- a/src/object/task/taskspiderexplo.cpp +++ b/src/object/task/taskspiderexplo.cpp @@ -45,10 +45,8 @@ CTaskSpiderExplo::CTaskSpiderExplo(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); - m_time = 0.0f; - m_bError = FALSE; + m_bError = false; } // Object's destructor. @@ -60,21 +58,21 @@ CTaskSpiderExplo::~CTaskSpiderExplo() // Management of an event. -BOOL CTaskSpiderExplo::EventProcess(const Event &event) +bool CTaskSpiderExplo::EventProcess(const Event &event) { - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; // Momentarily stationary object (ant on the back)? if ( m_object->RetFixed() ) { - m_bError = TRUE; - return TRUE; + m_bError = true; + return true; } m_time += event.rTime; - return TRUE; + return true; } @@ -88,7 +86,7 @@ Error CTaskSpiderExplo::Start() m_physics->SetMotorSpeedX(0.0f); // stops the advance m_physics->SetMotorSpeedZ(0.0f); // stops the rotation - m_bError = FALSE; + m_bError = false; return ERR_OK; } @@ -117,8 +115,8 @@ Error CTaskSpiderExplo::IsEnded() // Suddenly ends the current action. -BOOL CTaskSpiderExplo::Abort() +bool CTaskSpiderExplo::Abort() { - return TRUE; + return true; } diff --git a/src/object/task/taskspiderexplo.h b/src/object/task/taskspiderexplo.h index 3e68279..a08e9dd 100644 --- a/src/object/task/taskspiderexplo.h +++ b/src/object/task/taskspiderexplo.h @@ -35,16 +35,16 @@ public: CTaskSpiderExplo(CInstanceManager* iMan, CObject* object); ~CTaskSpiderExplo(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(); Error IsEnded(); - BOOL Abort(); + bool Abort(); protected: protected: float m_time; - BOOL m_bError; + bool m_bError; }; diff --git a/src/object/task/tasktake.cpp b/src/object/task/tasktake.cpp index 912033f..b09366a 100644 --- a/src/object/task/tasktake.cpp +++ b/src/object/task/tasktake.cpp @@ -52,8 +52,6 @@ CTaskTake::CTaskTake(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); - m_terrain = (CTerrain*)m_iMan->SearchInstance(CLASS_TERRAIN); m_arm = TTA_NEUTRAL; @@ -68,13 +66,13 @@ CTaskTake::~CTaskTake() // Management of an event. -BOOL CTaskTake::EventProcess(const Event &event) +bool CTaskTake::EventProcess(const Event &event) { float a, g, cirSpeed; - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; - if ( m_bError ) return FALSE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; + if ( m_bError ) return false; if ( m_bTurn ) // preliminary rotation? { @@ -85,14 +83,14 @@ BOOL CTaskTake::EventProcess(const Event &event) if ( cirSpeed < -1.0f ) cirSpeed = -1.0f; m_physics->SetMotorSpeedZ(cirSpeed); // turns left / right - return TRUE; + return true; } m_progress += event.rTime*m_speed; // others advance m_physics->SetMotorSpeed(D3DVECTOR(0.0f, 0.0f, 0.0f)); // immobile! - return TRUE; + return true; } @@ -113,7 +111,7 @@ Error CTaskTake::Start() iAngle = NormAngle(iAngle); // 0..2*PI oAngle = iAngle; - m_bError = TRUE; // operation impossible + m_bError = true; // operation impossible if ( !m_physics->RetLand() ) { pos = m_object->RetPosition(0); @@ -195,12 +193,12 @@ Error CTaskTake::Start() } } - m_bTurn = TRUE; // preliminary rotation necessary + m_bTurn = true; // preliminary rotation necessary m_angle = oAngle; // angle was reached - m_physics->SetFreeze(TRUE); // it does not move + m_physics->SetFreeze(true); // it does not move - m_bError = FALSE; // ok + m_bError = false; // ok return ERR_OK; } @@ -221,7 +219,7 @@ Error CTaskTake::IsEnded() if ( TestAngle(angle, m_angle-PI*0.01f, m_angle+PI*0.01f) ) { - m_bTurn = FALSE; // rotation ended + m_bTurn = false; // rotation ended m_physics->SetMotorSpeedZ(0.0f); if ( m_arm == TTA_FFRONT ) @@ -301,12 +299,12 @@ Error CTaskTake::IsEnded() // Suddenly ends the current action. -BOOL CTaskTake::Abort() +bool CTaskTake::Abort() { m_motion->SetAction(-1); m_camera->StopCentering(m_object, 0.8f); - m_physics->SetFreeze(FALSE); // is moving again - return TRUE; + m_physics->SetFreeze(false); // is moving again + return true; } @@ -467,7 +465,7 @@ CObject* CTaskTake::SearchFriendObject(float &angle, // Takes the object in front. -BOOL CTaskTake::TruckTakeObject() +bool CTaskTake::TruckTakeObject() { CObject* fret; CObject* other; @@ -478,7 +476,7 @@ BOOL CTaskTake::TruckTakeObject() { //? fret = SearchTakeObject(angle, 1.5f, PI*0.04f); fret = SearchTakeObject(angle, 1.5f, PI*0.15f); //OK 1.9 - if ( fret == 0 ) return FALSE; // rien � prendre ? + if ( fret == 0 ) return false; // rien � prendre ? m_fretType = fret->RetType(); fret->SetTruck(m_object); @@ -496,10 +494,10 @@ BOOL CTaskTake::TruckTakeObject() if ( m_arm == TTA_FRIEND ) // takes friend's battery? { other = SearchFriendObject(angle, 1.5f, PI*0.04f); - if ( other == 0 ) return FALSE; + if ( other == 0 ) return false; fret = other->RetPower(); - if ( fret == 0 ) return FALSE; // the other does not have a battery? + if ( fret == 0 ) return false; // the other does not have a battery? m_fretType = fret->RetType(); other->SetPower(0); @@ -515,12 +513,12 @@ BOOL CTaskTake::TruckTakeObject() m_object->SetFret(fret); // takes } - return TRUE; + return true; } // Deposes the object taken. -BOOL CTaskTake::TruckDeposeObject() +bool CTaskTake::TruckDeposeObject() { Character* character; CObject* fret; @@ -532,7 +530,7 @@ BOOL CTaskTake::TruckDeposeObject() if ( m_arm == TTA_FFRONT ) // deposes on the ground in front? { fret = m_object->RetFret(); - if ( fret == 0 ) return FALSE; // does nothing? + if ( fret == 0 ) return false; // does nothing? m_fretType = fret->RetType(); mat = fret->RetWorldMatrix(0); @@ -551,13 +549,13 @@ BOOL CTaskTake::TruckDeposeObject() if ( m_arm == TTA_FRIEND ) // deposes battery on friends? { other = SearchFriendObject(angle, 1.5f, PI*0.04f); - if ( other == 0 ) return FALSE; + if ( other == 0 ) return false; fret = other->RetPower(); - if ( fret != 0 ) return FALSE; // the other already has a battery? + if ( fret != 0 ) return false; // the other already has a battery? fret = m_object->RetFret(); - if ( fret == 0 ) return FALSE; + if ( fret == 0 ) return false; m_fretType = fret->RetType(); other->SetPower(fret); @@ -573,12 +571,12 @@ BOOL CTaskTake::TruckDeposeObject() m_object->SetFret(0); // deposit } - return TRUE; + return true; } // Seeks if a location allows to deposit an object. -BOOL CTaskTake::IsFreeDeposeObject(D3DVECTOR pos) +bool CTaskTake::IsFreeDeposeObject(D3DVECTOR pos) { CObject* pObj; D3DMATRIX* mat; @@ -603,11 +601,11 @@ BOOL CTaskTake::IsFreeDeposeObject(D3DVECTOR pos) { if ( Length(iPos, oPos)-(oRadius+1.0f) < 1.0f ) { - return FALSE; // location occupied + return false; // location occupied } } } - return TRUE; // location free + return true; // location free } diff --git a/src/object/task/tasktake.h b/src/object/task/tasktake.h index 31ccfef..f94c366 100644 --- a/src/object/task/tasktake.h +++ b/src/object/task/tasktake.h @@ -52,18 +52,18 @@ public: CTaskTake(CInstanceManager* iMan, CObject* object); ~CTaskTake(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(); Error IsEnded(); - BOOL Abort(); + bool Abort(); protected: CObject* SearchTakeObject(float &angle, float dLimit, float aLimit); CObject* SearchFriendObject(float &angle, float dLimit, float aLimit); - BOOL TruckTakeObject(); - BOOL TruckDeposeObject(); - BOOL IsFreeDeposeObject(D3DVECTOR pos); + bool TruckTakeObject(); + bool TruckDeposeObject(); + bool IsFreeDeposeObject(D3DVECTOR pos); protected: CTerrain* m_terrain; @@ -74,8 +74,8 @@ protected: float m_speed; float m_progress; float m_height; - BOOL m_bError; - BOOL m_bTurn; + bool m_bError; + bool m_bTurn; float m_angle; ObjectType m_fretType; }; diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index 9e07e05..a3403f0 100644 --- a/src/object/task/taskterraform.cpp +++ b/src/object/task/taskterraform.cpp @@ -54,7 +54,6 @@ CTaskTerraform::CTaskTerraform(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); m_lastParticule = 0.0f; m_soundChannel = -1; } @@ -68,7 +67,7 @@ CTaskTerraform::~CTaskTerraform() // Management of an event. -BOOL CTaskTerraform::EventProcess(const Event &event) +bool CTaskTerraform::EventProcess(const Event &event) { CObject* power; D3DMATRIX* mat; @@ -76,9 +75,9 @@ BOOL CTaskTerraform::EventProcess(const Event &event) FPOINT dim; float energy; - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; - if ( m_bError ) return FALSE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; + if ( m_bError ) return false; m_progress += event.rTime*m_speed; // others advance m_time += event.rTime; @@ -88,11 +87,11 @@ BOOL CTaskTerraform::EventProcess(const Event &event) if ( m_soundChannel == -1 ) { #if _TEEN - m_soundChannel = m_sound->Play(SOUND_GGG, m_object->RetPosition(0), 1.0f, 0.5f, TRUE); + m_soundChannel = m_sound->Play(SOUND_GGG, m_object->RetPosition(0), 1.0f, 0.5f, true); m_sound->AddEnvelope(m_soundChannel, 1.0f, 2.0f, 1.5f, SOPER_CONTINUE); m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.5f, 0.5f, SOPER_STOP); #else - m_soundChannel = m_sound->Play(SOUND_GGG, m_object->RetPosition(0), 1.0f, 0.5f, TRUE); + m_soundChannel = m_sound->Play(SOUND_GGG, m_object->RetPosition(0), 1.0f, 0.5f, true); m_sound->AddEnvelope(m_soundChannel, 1.0f, 2.0f, 4.0f, SOPER_CONTINUE); m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.5f, 0.5f, SOPER_STOP); #endif @@ -204,7 +203,7 @@ BOOL CTaskTerraform::EventProcess(const Event &event) } } - return TRUE; + return true; } @@ -219,7 +218,7 @@ Error CTaskTerraform::Start() ObjectType type; - m_bError = TRUE; // operation impossible + m_bError = true; // operation impossible if ( !m_physics->RetLand() ) return ERR_TERRA_VEH; type = m_object->RetType(); @@ -248,7 +247,7 @@ Error CTaskTerraform::Start() #endif m_time = 0.0f; - m_bError = FALSE; // ok + m_bError = false; // ok m_camera->StartCentering(m_object, PI*0.35f, 99.9f, 20.0f, 2.0f); return ERR_OK; @@ -340,7 +339,7 @@ Error CTaskTerraform::IsEnded() // Suddenly ends the current action. -BOOL CTaskTerraform::Abort() +bool CTaskTerraform::Abort() { CObject* power; @@ -363,13 +362,13 @@ BOOL CTaskTerraform::Abort() } m_camera->StopCentering(m_object, 2.0f); - return TRUE; + return true; } // Returns all the close ants and spiders. -BOOL CTaskTerraform::Terraform() +bool CTaskTerraform::Terraform() { CObject* pObj; CBrain* brain; @@ -412,18 +411,18 @@ BOOL CTaskTerraform::Terraform() brain = pObj->RetBrain(); if ( brain != 0 ) brain->StopTask(); motion->SetAction(MAS_BACK1, 0.8f+Rand()*0.3f); - pObj->SetFixed(TRUE); // not moving + pObj->SetFixed(true); // not moving } if ( type == OBJECT_SPIDER ) { brain = pObj->RetBrain(); if ( brain != 0 ) brain->StopTask(); motion->SetAction(MSS_BACK1, 0.8f+Rand()*0.3f); - pObj->SetFixed(TRUE); // not moving + pObj->SetFixed(true); // not moving } } } - return TRUE; + return true; } diff --git a/src/object/task/taskterraform.h b/src/object/task/taskterraform.h index bc66c66..dfb3488 100644 --- a/src/object/task/taskterraform.h +++ b/src/object/task/taskterraform.h @@ -47,14 +47,14 @@ public: CTaskTerraform(CInstanceManager* iMan, CObject* object); ~CTaskTerraform(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(); Error IsEnded(); - BOOL Abort(); + bool Abort(); protected: - BOOL Terraform(); + bool Terraform(); protected: TaskTerraPhase m_phase; @@ -63,7 +63,7 @@ protected: float m_time; float m_lastParticule; int m_soundChannel; - BOOL m_bError; + bool m_bError; D3DVECTOR m_terraPos; }; diff --git a/src/object/task/taskturn.cpp b/src/object/task/taskturn.cpp index d75f9d1..35f1eb9 100644 --- a/src/object/task/taskturn.cpp +++ b/src/object/task/taskturn.cpp @@ -44,7 +44,6 @@ CTaskTurn::CTaskTurn(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); } // Object's destructor. @@ -56,21 +55,21 @@ CTaskTurn::~CTaskTurn() // Management of an event. -BOOL CTaskTurn::EventProcess(const Event &event) +bool CTaskTurn::EventProcess(const Event &event) { - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; // Momentarily stationary object (ant on the back)? if ( m_object->RetFixed() ) { m_physics->SetMotorSpeedX(0.0f); // stops the advance m_physics->SetMotorSpeedZ(0.0f); // stops the rotation - m_bError = TRUE; - return TRUE; + m_bError = true; + return true; } - return TRUE; + return true; } @@ -86,18 +85,18 @@ Error CTaskTurn::Start(float angle) { m_angle = angle+m_physics->RetCirStopLength(); m_physics->SetMotorSpeedZ(-1.0f); // turns left - m_bLeft = TRUE; + m_bLeft = true; } else { m_angle = angle-m_physics->RetCirStopLength(); m_physics->SetMotorSpeedZ(1.0f); // turns right - m_bLeft = FALSE; + m_bLeft = false; } m_physics->SetMotorSpeedX(0.0f); m_physics->SetMotorSpeedY(0.0f); - m_bError = FALSE; + m_bError = false; return ERR_OK; } diff --git a/src/object/task/taskturn.h b/src/object/task/taskturn.h index 27cba98..b9a432b 100644 --- a/src/object/task/taskturn.h +++ b/src/object/task/taskturn.h @@ -35,7 +35,7 @@ public: CTaskTurn(CInstanceManager* iMan, CObject* object); ~CTaskTurn(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(float angle); Error IsEnded(); @@ -46,7 +46,7 @@ protected: float m_angle; float m_startAngle; float m_finalAngle; - BOOL m_bLeft; - BOOL m_bError; + bool m_bLeft; + bool m_bError; }; diff --git a/src/object/task/taskwait.cpp b/src/object/task/taskwait.cpp index 7560e9a..64883c1 100644 --- a/src/object/task/taskwait.cpp +++ b/src/object/task/taskwait.cpp @@ -44,7 +44,6 @@ CTaskWait::CTaskWait(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - CTask::CTask(iMan, object); } // Object's destructor. @@ -56,14 +55,14 @@ CTaskWait::~CTaskWait() // Management of an event. -BOOL CTaskWait::EventProcess(const Event &event) +bool CTaskWait::EventProcess(const Event &event) { - if ( m_engine->RetPause() ) return TRUE; - if ( event.event != EVENT_FRAME ) return TRUE; + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; m_passTime += event.rTime; m_bEnded = (m_passTime >= m_waitTime); - return TRUE; + return true; } @@ -73,7 +72,7 @@ Error CTaskWait::Start(float time) { m_waitTime = time; // duration to wait m_passTime = 0.0f; // time elapsed - m_bEnded = FALSE; + m_bEnded = false; return ERR_OK; } diff --git a/src/object/task/taskwait.h b/src/object/task/taskwait.h index 7a33f49..25e8e67 100644 --- a/src/object/task/taskwait.h +++ b/src/object/task/taskwait.h @@ -35,7 +35,7 @@ public: CTaskWait(CInstanceManager* iMan, CObject* object); ~CTaskWait(); - BOOL EventProcess(const Event &event); + bool EventProcess(const Event &event); Error Start(float time); Error IsEnded(); @@ -45,6 +45,6 @@ protected: protected: float m_waitTime; float m_passTime; - BOOL m_bEnded; + bool m_bEnded; }; -- cgit v1.2.3-1-g7c22