diff options
Diffstat (limited to 'src/object/motion')
| -rw-r--r-- | src/object/motion/motion.cpp | 28 | ||||
| -rw-r--r-- | src/object/motion/motion.h | 12 | ||||
| -rw-r--r-- | src/object/motion/motionant.cpp | 28 | ||||
| -rw-r--r-- | src/object/motion/motionant.h | 10 | ||||
| -rw-r--r-- | src/object/motion/motionbee.cpp | 28 | ||||
| -rw-r--r-- | src/object/motion/motionbee.h | 10 | ||||
| -rw-r--r-- | src/object/motion/motionhuman.cpp | 42 | ||||
| -rw-r--r-- | src/object/motion/motionhuman.h | 12 | ||||
| -rw-r--r-- | src/object/motion/motionmother.cpp | 26 | ||||
| -rw-r--r-- | src/object/motion/motionmother.h | 10 | ||||
| -rw-r--r-- | src/object/motion/motionspider.cpp | 28 | ||||
| -rw-r--r-- | src/object/motion/motionspider.h | 10 | ||||
| -rw-r--r-- | src/object/motion/motiontoto.cpp | 52 | ||||
| -rw-r--r-- | src/object/motion/motiontoto.h | 14 | ||||
| -rw-r--r-- | src/object/motion/motionvehicle.cpp | 58 | ||||
| -rw-r--r-- | src/object/motion/motionvehicle.h | 22 | ||||
| -rw-r--r-- | src/object/motion/motionworm.cpp | 34 | ||||
| -rw-r--r-- | src/object/motion/motionworm.h | 12 |
18 files changed, 218 insertions, 218 deletions
diff --git a/src/object/motion/motion.cpp b/src/object/motion/motion.cpp index 27e5f9c..52609a9 100644 --- a/src/object/motion/motion.cpp +++ b/src/object/motion/motion.cpp @@ -84,7 +84,7 @@ CMotion::~CMotion() // Deletes the object.
-void CMotion::DeleteObject(BOOL bAll)
+void CMotion::DeleteObject(bool bAll)
{
}
@@ -102,22 +102,22 @@ void CMotion::SetBrain(CBrain* brain) // Creates.
-BOOL CMotion::Create(D3DVECTOR pos, float angle, ObjectType type, float power)
+bool CMotion::Create(D3DVECTOR pos, float angle, ObjectType type, float power)
{
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CMotion::EventProcess(const Event &event)
+bool CMotion::EventProcess(const Event &event)
{
D3DVECTOR pos, dir;
float time;
if ( m_object->RetType() != OBJECT_TOTO &&
- m_engine->RetPause() ) return TRUE;
+ m_engine->RetPause() ) return true;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_actionTime;
if ( m_progress > 1.0f ) m_progress = 1.0f; // (*)
@@ -150,7 +150,7 @@ BOOL CMotion::EventProcess(const Event &event) dir.z = Smooth(dir.z, m_inclinaison.z, time);
m_object->SetInclinaison(dir);
- return TRUE;
+ return true;
}
// (*) Avoids the bug of ants returned by the thumper and
@@ -177,9 +177,9 @@ int CMotion::RetAction() // Specifies a special parameter.
-BOOL CMotion::SetParam(int rank, float value)
+bool CMotion::SetParam(int rank, float value)
{
- return FALSE;
+ return false;
}
float CMotion::RetParam(int rank)
@@ -190,11 +190,11 @@ float CMotion::RetParam(int rank) // Saves all parameters of the object.
-BOOL CMotion::Write(char *line)
+bool CMotion::Write(char *line)
{
char name[100];
- if ( m_actionType == -1 ) return FALSE;
+ if ( m_actionType == -1 ) return false;
sprintf(name, " mType=%d", m_actionType);
strcat(line, name);
@@ -205,18 +205,18 @@ BOOL CMotion::Write(char *line) sprintf(name, " mProgress=%.2f", m_progress);
strcat(line, name);
- return FALSE;
+ return false;
}
// Restores all parameters of the object.
-BOOL CMotion::Read(char *line)
+bool CMotion::Read(char *line)
{
m_actionType = OpInt(line, "mType", -1);
m_actionTime = OpFloat(line, "mTime", 0.0f);
m_progress = OpFloat(line, "mProgress", 0.0f);
- return FALSE;
+ return false;
}
diff --git a/src/object/motion/motion.h b/src/object/motion/motion.h index ce7b522..555fbe4 100644 --- a/src/object/motion/motion.h +++ b/src/object/motion/motion.h @@ -45,17 +45,17 @@ public: void SetPhysics(CPhysics* physics);
void SetBrain(CBrain* brain);
- virtual void DeleteObject(BOOL bAll=FALSE);
- virtual BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- virtual BOOL EventProcess(const Event &event);
+ virtual void DeleteObject(bool bAll=false);
+ virtual bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ virtual bool EventProcess(const Event &event);
virtual Error SetAction(int action, float time=0.2f);
virtual int RetAction();
- virtual BOOL SetParam(int rank, float value);
+ virtual bool SetParam(int rank, float value);
virtual float RetParam(int rank);
- virtual BOOL Write(char *line);
- virtual BOOL Read(char *line);
+ virtual bool Write(char *line);
+ virtual bool Read(char *line);
virtual void SetLinVibration(D3DVECTOR dir);
virtual D3DVECTOR RetLinVibration();
diff --git a/src/object/motion/motionant.cpp b/src/object/motion/motionant.cpp index ca7505b..0f6543a 100644 --- a/src/object/motion/motionant.cpp +++ b/src/object/motion/motionant.cpp @@ -43,7 +43,7 @@ -#define ADJUST_ANGLE FALSE // TRUE -> adjusts the angles of the members
+#define ADJUST_ANGLE false // true -> adjusts the angles of the members
#define START_TIME 1000.0f // beginning of the relative time
@@ -61,7 +61,7 @@ CMotionAnt::CMotionAnt(CInstanceManager* iMan, CObject* object) m_armPartIndex = 0;
m_armMemberIndex = 0;
m_armLastAction = -1;
- m_bArmStop = FALSE;
+ m_bArmStop = false;
m_lastParticule = 0.0f;
}
@@ -74,20 +74,20 @@ CMotionAnt::~CMotionAnt() // Removes an object.
-void CMotionAnt::DeleteObject(BOOL bAll)
+void CMotionAnt::DeleteObject(bool bAll)
{
}
// Creates a vehicle poses some rolling on the floor.
-BOOL CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
int rank;
- if ( m_engine->RetRestCreate() < 3+18 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 3+18 ) return false;
pModFile = new CModFile(m_iMan);
@@ -309,7 +309,7 @@ BOOL CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the physics of the object.
@@ -430,7 +430,7 @@ void CMotionAnt::CreatePhysics() // Management of an event.
-BOOL CMotionAnt::EventProcess(const Event &event)
+bool CMotionAnt::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -469,7 +469,7 @@ BOOL CMotionAnt::EventProcess(const Event &event) #endif
}
- return TRUE;
+ return true;
}
// Calculates a value (radians) proportional between a and b (degrees).
@@ -486,17 +486,17 @@ inline float Propf(float a, float b, float p) // Management of an event.
-BOOL CMotionAnt::EventFrame(const Event &event)
+bool CMotionAnt::EventFrame(const Event &event)
{
D3DVECTOR dir, pos, speed;
FPOINT dim;
float s, a, prog, time;
float tSt[9], tNd[9];
int i, ii, st, nd, action;
- BOOL bStop;
+ bool bStop;
- if ( m_engine->RetPause() ) return TRUE;
- if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return true;
s = m_physics->RetLinMotionX(MO_MOTSPEED)*1.5f;
a = Abs(m_physics->RetCirMotionY(MO_MOTSPEED)*2.0f);
@@ -833,7 +833,7 @@ BOOL CMotionAnt::EventFrame(const Event &event) if ( m_progress >= 1.0f )
{
SetAction(-1);
- m_object->SetFixed(FALSE); // moving again
+ m_object->SetFixed(false); // moving again
}
}
else
@@ -893,7 +893,7 @@ BOOL CMotionAnt::EventFrame(const Event &event) m_object->SetAngleY(1, sinf(m_armTimeAbs*2.1f)*0.50f); // head
}
- return TRUE;
+ return true;
}
diff --git a/src/object/motion/motionant.h b/src/object/motion/motionant.h index 4d5781a..084a9a9 100644 --- a/src/object/motion/motionant.h +++ b/src/object/motion/motionant.h @@ -53,13 +53,13 @@ public: CMotionAnt(CInstanceManager* iMan, CObject* object);
~CMotionAnt();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
protected:
void CreatePhysics();
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
float m_armMember;
@@ -71,7 +71,7 @@ protected: int m_armPartIndex;
int m_armMemberIndex;
int m_armLastAction;
- BOOL m_bArmStop;
+ bool m_bArmStop;
float m_lastParticule;
};
diff --git a/src/object/motion/motionbee.cpp b/src/object/motion/motionbee.cpp index 21a465a..7f3da7a 100644 --- a/src/object/motion/motionbee.cpp +++ b/src/object/motion/motionbee.cpp @@ -43,7 +43,7 @@ -#define ADJUST_ANGLE FALSE // TRUE -> adjusts the angles of the members
+#define ADJUST_ANGLE false // true -> adjusts the angles of the members
#define START_TIME 1000.0f // beginning of the relative time
@@ -61,7 +61,7 @@ CMotionBee::CMotionBee(CInstanceManager* iMan, CObject* object) m_armPartIndex = 0;
m_armMemberIndex = 0;
m_armLastAction = -1;
- m_bArmStop = FALSE;
+ m_bArmStop = false;
}
// Object's destructor.
@@ -73,20 +73,20 @@ CMotionBee::~CMotionBee() // Removes an object.
-void CMotionBee::DeleteObject(BOOL bAll)
+void CMotionBee::DeleteObject(bool bAll)
{
}
// Creates a vehicle traveling any lands on the ground.
-BOOL CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
int rank;
- if ( m_engine->RetRestCreate() < 3+18+2 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 3+18+2 ) return false;
pModFile = new CModFile(m_iMan);
@@ -321,7 +321,7 @@ BOOL CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the physical object.
@@ -407,7 +407,7 @@ void CMotionBee::CreatePhysics() // Management of an event.
-BOOL CMotionBee::EventProcess(const Event &event)
+bool CMotionBee::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -446,20 +446,20 @@ BOOL CMotionBee::EventProcess(const Event &event) #endif
}
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CMotionBee::EventFrame(const Event &event)
+bool CMotionBee::EventFrame(const Event &event)
{
D3DVECTOR dir;
float s, a, prog;
int action, i, st, nd;
- BOOL bStop;
+ bool bStop;
- if ( m_engine->RetPause() ) return TRUE;
- if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return true;
s = m_physics->RetLinMotionX(MO_MOTSPEED)*0.30f;
a = Abs(m_physics->RetCirMotionY(MO_MOTSPEED)*2.00f);
@@ -471,7 +471,7 @@ BOOL CMotionBee::EventFrame(const Event &event) m_armMember += (s+a)*event.rTime*0.15f;
bStop = ( a == 0.0f && s == 0.0f ); // stopped?
- if ( !m_physics->RetLand() ) bStop = TRUE;
+ if ( !m_physics->RetLand() ) bStop = true;
if ( bStop )
{
@@ -655,7 +655,7 @@ BOOL CMotionBee::EventFrame(const Event &event) m_engine->SetObjectShadowColor(m_objectPart[0].object, color);
#endif
- return TRUE;
+ return true;
}
diff --git a/src/object/motion/motionbee.h b/src/object/motion/motionbee.h index e73e2d3..a62f2ba 100644 --- a/src/object/motion/motionbee.h +++ b/src/object/motion/motionbee.h @@ -47,13 +47,13 @@ public: CMotionBee(CInstanceManager* iMan, CObject* object);
~CMotionBee();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
protected:
void CreatePhysics();
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
float m_armMember;
@@ -65,6 +65,6 @@ protected: int m_armPartIndex;
int m_armMemberIndex;
int m_armLastAction;
- BOOL m_bArmStop;
+ bool m_bArmStop;
};
diff --git a/src/object/motion/motionhuman.cpp b/src/object/motion/motionhuman.cpp index c164570..02e4dd3 100644 --- a/src/object/motion/motionhuman.cpp +++ b/src/object/motion/motionhuman.cpp @@ -45,7 +45,7 @@ -#define ADJUST_ANGLE FALSE // TRUE -> adjusts the angles of the members
+#define ADJUST_ANGLE false // true -> adjusts the angles of the members
#define ADJUST_ACTION (3*3*3*3*MH_SPEC+3*3*3*MHS_SATCOM)
#define START_TIME 1000.0f // beginning of the relative time
@@ -66,12 +66,12 @@ CMotionHuman::CMotionHuman(CInstanceManager* iMan, CObject* object) m_armPartIndex = 0;
m_armMemberIndex = 0;
m_armLastAction = -1;
- m_bArmStop = FALSE;
+ m_bArmStop = false;
m_lastSoundMarch = 0.0f;
m_lastSoundHhh = 0.0f;
m_time = 0.0f;
m_tired = 0.0f;
- m_bDisplayPerso = FALSE;
+ m_bDisplayPerso = false;
}
// Object's constructor.
@@ -83,7 +83,7 @@ CMotionHuman::~CMotionHuman() // Removes an object.
-void CMotionHuman::DeleteObject(BOOL bAll)
+void CMotionHuman::DeleteObject(bool bAll)
{
if ( m_partiReactor != -1 )
{
@@ -105,14 +105,14 @@ Error CMotionHuman::SetAction(int action, float time) // Creates cosmonaut on the ground.
-BOOL CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
char filename[100];
int rank, option, face, glasses;
- if ( m_engine->RetRestCreate() < 16 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 16 ) return false;
pModFile = new CModFile(m_iMan);
@@ -147,7 +147,7 @@ BOOL CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the main base.
@@ -371,7 +371,7 @@ BOOL CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the physical object.
@@ -664,7 +664,7 @@ void CMotionHuman::CreatePhysics(ObjectType type) // Management of an event.
-BOOL CMotionHuman::EventProcess(const Event &event)
+bool CMotionHuman::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -710,7 +710,7 @@ BOOL CMotionHuman::EventProcess(const Event &event) #endif
}
- return TRUE;
+ return true;
}
// Calculates a value (radians) proportional between a and b (degrees).
@@ -727,7 +727,7 @@ inline float Propf(float a, float b, float p) // Management of an event.
-BOOL CMotionHuman::EventFrame(const Event &event)
+bool CMotionHuman::EventFrame(const Event &event)
{
D3DMATRIX* mat;
D3DVECTOR dir, actual, pos, speed, pf;
@@ -737,7 +737,7 @@ BOOL CMotionHuman::EventFrame(const Event &event) float tSt[9], tNd[9];
float aa, bb, shield, deadFactor, level;
int i, ii, st, nd, action, legAction, armAction;
- BOOL bOnBoard, bSwim, bStop;
+ bool bOnBoard, bSwim, bStop;
if ( m_engine->RetPause() )
{
@@ -747,15 +747,15 @@ BOOL CMotionHuman::EventFrame(const Event &event) }
else
{
- return TRUE;
+ return true;
}
}
- bOnBoard = FALSE;
+ bOnBoard = false;
if ( m_object->RetSelect() &&
m_camera->RetType() == CAMERA_ONBOARD )
{
- bOnBoard = TRUE;
+ bOnBoard = true;
}
if ( m_bDisplayPerso && m_main->RetGamerOnlyHead() )
@@ -763,7 +763,7 @@ BOOL CMotionHuman::EventFrame(const Event &event) m_time += event.rTime;
m_object->SetLinVibration(D3DVECTOR(0.0f, -0.55f, 0.0f));
m_object->SetCirVibration(D3DVECTOR(0.0f, m_main->RetPersoAngle(), 0.0f));
- return TRUE;
+ return true;
}
if ( m_bDisplayPerso )
{
@@ -1439,7 +1439,7 @@ BOOL CMotionHuman::EventFrame(const Event &event) {
if ( m_progress >= 1.0f )
{
- m_object->SetEnable(FALSE);
+ m_object->SetEnable(false);
}
time = 100.0f;
@@ -1483,7 +1483,7 @@ BOOL CMotionHuman::EventFrame(const Event &event) if ( prog >= 1.0f )
{
prog = 1.0f;
- if ( pos.y >= level ) m_object->SetEnable(FALSE);
+ if ( pos.y >= level ) m_object->SetEnable(false);
}
prog *= 2.0f;
@@ -1778,7 +1778,7 @@ BOOL CMotionHuman::EventFrame(const Event &event) m_lastSoundHhh = (4.0f-m_tired*2.5f)+(4.0f-m_tired*2.5f)*Rand();
}
- return TRUE;
+ return true;
}
@@ -1786,12 +1786,12 @@ BOOL CMotionHuman::EventFrame(const Event &event) void CMotionHuman::StartDisplayPerso()
{
- m_bDisplayPerso = TRUE;
+ m_bDisplayPerso = true;
}
void CMotionHuman::StopDisplayPerso()
{
- m_bDisplayPerso = FALSE;
+ m_bDisplayPerso = false;
}
diff --git a/src/object/motion/motionhuman.h b/src/object/motion/motionhuman.h index 2cb685a..e563a81 100644 --- a/src/object/motion/motionhuman.h +++ b/src/object/motion/motionhuman.h @@ -66,9 +66,9 @@ public: CMotionHuman(CInstanceManager* iMan, CObject* object);
~CMotionHuman();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
Error SetAction(int action, float time=0.2f);
void StartDisplayPerso();
@@ -76,7 +76,7 @@ public: protected:
void CreatePhysics(ObjectType type);
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
int m_partiReactor;
@@ -89,11 +89,11 @@ protected: int m_armPartIndex;
int m_armMemberIndex;
int m_armLastAction;
- BOOL m_bArmStop;
+ bool m_bArmStop;
float m_lastSoundMarch;
float m_lastSoundHhh;
float m_time;
float m_tired;
- BOOL m_bDisplayPerso;
+ bool m_bDisplayPerso;
};
diff --git a/src/object/motion/motionmother.cpp b/src/object/motion/motionmother.cpp index 8e0073b..6db0a8b 100644 --- a/src/object/motion/motionmother.cpp +++ b/src/object/motion/motionmother.cpp @@ -43,7 +43,7 @@ -#define ADJUST_ANGLE FALSE // TRUE -> adjusts the angles of the members
+#define ADJUST_ANGLE false // true -> adjusts the angles of the members
#define START_TIME 1000.0f // beginning of the relative time
@@ -62,7 +62,7 @@ CMotionMother::CMotionMother(CInstanceManager* iMan, CObject* object) m_armMemberIndex = 0;
m_armLastAction = -1;
m_specAction = -1;
- m_bArmStop = FALSE;
+ m_bArmStop = false;
}
// Object's destructor.
@@ -74,20 +74,20 @@ CMotionMother::~CMotionMother() // Removes an object.
-void CMotionMother::DeleteObject(BOOL bAll)
+void CMotionMother::DeleteObject(bool bAll)
{
}
// Creates a vehicle traveling any lands on the ground.
-BOOL CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
int rank;
- if ( m_engine->RetRestCreate() < 2+12+6 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 2+12+6 ) return false;
pModFile = new CModFile(m_iMan);
@@ -295,7 +295,7 @@ BOOL CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the physics of the object.
@@ -356,7 +356,7 @@ void CMotionMother::CreatePhysics() // Management of an event.
-BOOL CMotionMother::EventProcess(const Event &event)
+bool CMotionMother::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -395,20 +395,20 @@ BOOL CMotionMother::EventProcess(const Event &event) #endif
}
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CMotionMother::EventFrame(const Event &event)
+bool CMotionMother::EventFrame(const Event &event)
{
D3DVECTOR dir;
float s, a, prog;
int i, st, nd;
- BOOL bStop;
+ bool bStop;
- if ( m_engine->RetPause() ) return TRUE;
- if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return true;
s = m_physics->RetLinMotionX(MO_MOTSPEED)*1.5f;
a = Abs(m_physics->RetCirMotionY(MO_MOTSPEED)*26.0f);
@@ -535,7 +535,7 @@ BOOL CMotionMother::EventFrame(const Event &event) m_object->SetAngleY(19, sinf(m_armTimeAbs*0.9f)*0.20f); // left claw
m_object->SetAngleZ(19, -0.20f);
- return TRUE;
+ return true;
}
diff --git a/src/object/motion/motionmother.h b/src/object/motion/motionmother.h index 3c5cb94..d3a6b2a 100644 --- a/src/object/motion/motionmother.h +++ b/src/object/motion/motionmother.h @@ -39,13 +39,13 @@ public: CMotionMother(CInstanceManager* iMan, CObject* object);
~CMotionMother();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
protected:
void CreatePhysics();
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
float m_armMember;
@@ -59,6 +59,6 @@ protected: int m_armLastAction;
int m_specAction;
float m_specTime;
- BOOL m_bArmStop;
+ bool m_bArmStop;
};
diff --git a/src/object/motion/motionspider.cpp b/src/object/motion/motionspider.cpp index 7b51290..2671933 100644 --- a/src/object/motion/motionspider.cpp +++ b/src/object/motion/motionspider.cpp @@ -43,7 +43,7 @@ -#define ADJUST_ANGLE FALSE // TRUE -> adjusts the angles of the members
+#define ADJUST_ANGLE false // true -> adjusts the angles of the members
#define START_TIME 1000.0f // beginning of the relative time
@@ -61,7 +61,7 @@ CMotionSpider::CMotionSpider(CInstanceManager* iMan, CObject* object) m_armPartIndex = 0;
m_armMemberIndex = 0;
m_armLastAction = -1;
- m_bArmStop = FALSE;
+ m_bArmStop = false;
m_lastParticule = 0.0f;
}
@@ -74,14 +74,14 @@ CMotionSpider::~CMotionSpider() // Removes an object.
-void CMotionSpider::DeleteObject(BOOL bAll)
+void CMotionSpider::DeleteObject(bool bAll)
{
}
// Creates a vehicle traveling any lands on the ground.
-BOOL CMotionSpider::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionSpider::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
@@ -112,7 +112,7 @@ BOOL CMotionSpider::Create(D3DVECTOR pos, float angle, ObjectType type, 0.0f, 0.0f, -2.0f,
};
- if ( m_engine->RetRestCreate() < 3+32+2 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 3+32+2 ) return false;
pModFile = new CModFile(m_iMan);
@@ -218,7 +218,7 @@ BOOL CMotionSpider::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the physics of the object.
@@ -343,7 +343,7 @@ void CMotionSpider::CreatePhysics() // Management of an event.
-BOOL CMotionSpider::EventProcess(const Event &event)
+bool CMotionSpider::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -383,7 +383,7 @@ BOOL CMotionSpider::EventProcess(const Event &event) #endif
}
- return TRUE;
+ return true;
}
// Calculates a value (radians) proportional between a and b (degrees).
@@ -400,17 +400,17 @@ inline float Propf(float a, float b, float p) // Management of an event.
-BOOL CMotionSpider::EventFrame(const Event &event)
+bool CMotionSpider::EventFrame(const Event &event)
{
D3DVECTOR dir, pos, speed;
FPOINT dim;
float s, a, prog, time;
float tSt[12], tNd[12];
int i, ii, st, nd, action;
- BOOL bStop;
+ bool bStop;
- if ( m_engine->RetPause() ) return TRUE;
- if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return true;
s = m_physics->RetLinMotionX(MO_MOTSPEED)*1.5f;
a = Abs(m_physics->RetCirMotionY(MO_MOTSPEED)*2.0f);
@@ -738,7 +738,7 @@ BOOL CMotionSpider::EventFrame(const Event &event) if ( m_progress >= 1.0f )
{
SetAction(-1);
- m_object->SetFixed(FALSE); // moving again
+ m_object->SetFixed(false); // moving again
}
}
else
@@ -781,7 +781,7 @@ BOOL CMotionSpider::EventFrame(const Event &event) m_object->SetAngleY(36, -sinf(m_armTimeAbs*3.1f)*0.20f); // mandible
}
- return TRUE;
+ return true;
}
diff --git a/src/object/motion/motionspider.h b/src/object/motion/motionspider.h index f642afe..bda769d 100644 --- a/src/object/motion/motionspider.h +++ b/src/object/motion/motionspider.h @@ -51,13 +51,13 @@ public: CMotionSpider(CInstanceManager* iMan, CObject* object);
~CMotionSpider();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
protected:
void CreatePhysics();
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
float m_armMember;
@@ -69,7 +69,7 @@ protected: int m_armPartIndex;
int m_armMemberIndex;
int m_armLastAction;
- BOOL m_bArmStop;
+ bool m_bArmStop;
float m_lastParticule;
};
diff --git a/src/object/motion/motiontoto.cpp b/src/object/motion/motiontoto.cpp index 7ba4192..64ff021 100644 --- a/src/object/motion/motiontoto.cpp +++ b/src/object/motion/motiontoto.cpp @@ -54,9 +54,9 @@ CMotionToto::CMotionToto(CInstanceManager* iMan, CObject* object) : CMotion(iMan, object)
{
m_time = 0.0f;
- m_bDisplayInfo = FALSE;
- m_bQuickPos = FALSE;
- m_bStartAction = FALSE;
+ m_bDisplayInfo = false;
+ m_bQuickPos = false;
+ m_bStartAction = false;
m_speedAction = 20.0f;
m_soundChannel = -1;
m_clownRadius = 0.0f;
@@ -78,7 +78,7 @@ CMotionToto::~CMotionToto() // Removes an object.
-void CMotionToto::DeleteObject(BOOL bAll)
+void CMotionToto::DeleteObject(bool bAll)
{
if ( m_soundChannel != -1 )
{
@@ -90,13 +90,13 @@ void CMotionToto::DeleteObject(BOOL bAll) // Creates a vehicle traveling any lands on the ground.
-BOOL CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
int rank;
- if ( m_engine->RetRestCreate() < 10 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 10 ) return false;
pModFile = new CModFile(m_iMan);
@@ -206,7 +206,7 @@ BOOL CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
@@ -216,7 +216,7 @@ void CMotionToto::StartDisplayInfo() {
return;
//?
- m_bDisplayInfo = TRUE;
+ m_bDisplayInfo = true;
m_actionType = -1;
m_actionTime = 0.0f;
@@ -230,8 +230,8 @@ return; void CMotionToto::StopDisplayInfo()
{
- m_bDisplayInfo = FALSE;
- m_bQuickPos = TRUE;
+ m_bDisplayInfo = false;
+ m_bQuickPos = true;
}
// Gives the position of the mouse.
@@ -244,7 +244,7 @@ void CMotionToto::SetMousePos(FPOINT pos) // Management of an event.
-BOOL CMotionToto::EventProcess(const Event &event)
+bool CMotionToto::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -253,12 +253,12 @@ BOOL CMotionToto::EventProcess(const Event &event) return EventFrame(event);
}
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CMotionToto::EventFrame(const Event &event)
+bool CMotionToto::EventFrame(const Event &event)
{
D3DMATRIX* mat;
D3DVECTOR eye, lookat, dir, perp, nPos, aPos, pos, speed;
@@ -269,28 +269,28 @@ BOOL CMotionToto::EventFrame(const Event &event) float progress, focus, distance, shift, verti, level, zoom;
float aAngle, nAngle, mAngle, angle, linSpeed, cirSpeed;
int sheet, i, r;
- BOOL bHidden;
+ bool bHidden;
if ( m_engine->RetPause() &&
- !m_main->RetInfoLock() ) return TRUE;
+ !m_main->RetInfoLock() ) return true;
if ( m_bDisplayInfo ) // "looks" mouse?
{
- bHidden = FALSE;
+ bHidden = false;
}
else
{
- bHidden = FALSE;
+ bHidden = false;
if ( m_main->RetMovieLock() ) // current movie?
{
- bHidden = TRUE;
+ bHidden = true;
}
if ( !m_engine->RetTotoMode() )
{
if ( !m_main->RetEditLock() ) // current edition?
{
- bHidden = TRUE;
+ bHidden = true;
}
}
}
@@ -298,10 +298,10 @@ BOOL CMotionToto::EventFrame(const Event &event) if ( bHidden )
{
nPos = m_object->RetPosition(0);
- m_terrain->MoveOnFloor(nPos, TRUE);
+ m_terrain->MoveOnFloor(nPos, true);
nPos.y -= 100.0f; // hidden under the ground!
m_object->SetPosition(0, nPos);
- return TRUE;
+ return true;
}
m_time += event.rTime;
@@ -442,7 +442,7 @@ BOOL CMotionToto::EventFrame(const Event &event) if ( m_bQuickPos ) // immediately in place?
{
- m_bQuickPos = FALSE;
+ m_bQuickPos = false;
linSpeed = 0.0f;
}
else
@@ -456,7 +456,7 @@ BOOL CMotionToto::EventFrame(const Event &event) {
if ( m_bStartAction )
{
- m_bStartAction = FALSE;
+ m_bStartAction = false;
m_speedAction = Length(nPos, aPos)/15.0f;
if ( m_speedAction < 20.0f ) m_speedAction = 20.0f;
}
@@ -809,7 +809,7 @@ BOOL CMotionToto::EventFrame(const Event &event) }
//? if ( m_bDisplayInfo && m_main->RetGlint() )
- if ( FALSE )
+ if ( false )
{
pos.x = (Rand()-0.5f)*1.4f;
pos.y = (Rand()-0.5f)*1.4f+3.5f;
@@ -846,7 +846,7 @@ BOOL CMotionToto::EventFrame(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -858,7 +858,7 @@ Error CMotionToto::SetAction(int action, float time) CMotion::SetAction(action, time);
- m_bStartAction = TRUE;
+ m_bStartAction = true;
sound = SOUND_CLICK;
if ( action == MT_ERROR ) sound = SOUND_ERROR;
diff --git a/src/object/motion/motiontoto.h b/src/object/motion/motiontoto.h index 3549638..1c7f871 100644 --- a/src/object/motion/motiontoto.h +++ b/src/object/motion/motiontoto.h @@ -46,9 +46,9 @@ public: CMotionToto(CInstanceManager* iMan, CObject* object);
~CMotionToto();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
Error SetAction(int action, float time=0.2f);
void SetLinkType(ObjectType type);
@@ -57,14 +57,14 @@ public: void SetMousePos(FPOINT pos);
protected:
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
float m_time;
float m_lastMotorParticule;
- BOOL m_bDisplayInfo;
- BOOL m_bQuickPos;
- BOOL m_bStartAction;
+ bool m_bDisplayInfo;
+ bool m_bQuickPos;
+ bool m_bStartAction;
float m_speedAction;
float m_clownRadius;
float m_clownDelay;
diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp index 61b4db5..56eab8d 100644 --- a/src/object/motion/motionvehicle.cpp +++ b/src/object/motion/motionvehicle.cpp @@ -74,9 +74,9 @@ CMotionVehicle::CMotionVehicle(CInstanceManager* iMan, CObject* object) m_wheelLastPos = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_wheelLastAngle = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_posKey = D3DVECTOR(0.0f, 0.0f, 0.0f);
- m_bFlyFix = FALSE;
+ m_bFlyFix = false;
- m_bTraceDown = FALSE;
+ m_bTraceDown = false;
m_traceColor = 1; // black
m_traceWidth = 0.5f;
}
@@ -90,7 +90,7 @@ CMotionVehicle::~CMotionVehicle() // Removes an object.
-void CMotionVehicle::DeleteObject(BOOL bAll)
+void CMotionVehicle::DeleteObject(bool bAll)
{
if ( m_partiReactor != -1 )
{
@@ -102,7 +102,7 @@ void CMotionVehicle::DeleteObject(BOOL bAll) // Creates a vehicle traveling any lands on the ground.
-BOOL CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
@@ -111,7 +111,7 @@ BOOL CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type, D3DCOLORVALUE color;
char name[50];
- if ( m_engine->RetRestCreate() < 1+5+18+1 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 1+5+18+1 ) return false;
pModFile = new CModFile(m_iMan);
@@ -1075,7 +1075,7 @@ BOOL CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the physics of the object.
@@ -1364,7 +1364,7 @@ void CMotionVehicle::CreatePhysics(ObjectType type) // Management of an event.
-BOOL CMotionVehicle::EventProcess(const Event &event)
+bool CMotionVehicle::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -1377,12 +1377,12 @@ BOOL CMotionVehicle::EventProcess(const Event &event) {
}
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CMotionVehicle::EventFrame(const Event &event)
+bool CMotionVehicle::EventFrame(const Event &event)
{
D3DMATRIX* mat;
Character* character;
@@ -1391,8 +1391,8 @@ BOOL CMotionVehicle::EventFrame(const Event &event) float s, a, speedBL, speedBR, speedFL, speedFR, h, a1, a2;
float back, front, dist, radius, limit[2];
- if ( m_engine->RetPause() ) return TRUE;
- if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return true;
type = m_object->RetType();
@@ -1705,12 +1705,12 @@ BOOL CMotionVehicle::EventFrame(const Event &event) EventFrameCanoni(event);
}
- return TRUE;
+ return true;
}
// Managing an event for a flying robot.
-BOOL CMotionVehicle::EventFrameFly(const Event &event)
+bool CMotionVehicle::EventFrameFly(const Event &event)
{
D3DMATRIX* mat;
D3DVECTOR pos, angle, paw[3];
@@ -1725,7 +1725,7 @@ BOOL CMotionVehicle::EventFrameFly(const Event &event) pos.z == m_wheelLastPos.z &&
angle.x == m_wheelLastAngle.x &&
angle.y == m_wheelLastAngle.y &&
- angle.z == m_wheelLastAngle.z ) return TRUE;
+ angle.z == m_wheelLastAngle.z ) return true;
m_wheelLastPos = pos;
m_wheelLastAngle = angle;
@@ -1753,29 +1753,29 @@ BOOL CMotionVehicle::EventFrameFly(const Event &event) hope[2] = 0.0f; // left back
}
- m_bFlyFix = TRUE;
+ m_bFlyFix = true;
for ( i=0 ; i<3 ; i++ )
{
actual = m_object->RetAngleZ(6+i);
final = Smooth(actual, hope[i], event.rTime*5.0f);
if ( final != actual )
{
- m_bFlyFix = FALSE; // it is moving
+ m_bFlyFix = false; // it is moving
m_object->SetAngleZ(6+i, final);
}
}
- return TRUE;
+ return true;
}
// Event management for insect legs.
-BOOL CMotionVehicle::EventFrameInsect(const Event &event)
+bool CMotionVehicle::EventFrameInsect(const Event &event)
{
D3DVECTOR dir;
float s, a, prog, time;
int i, st, nd, action;
- BOOL bStop, bOnBoard;
+ bool bStop, bOnBoard;
static int table[] =
{
@@ -1797,11 +1797,11 @@ BOOL CMotionVehicle::EventFrameInsect(const Event &event) -50,0,0, -65,0,0, -65,0,0, // s0: feet 1..4
};
- bOnBoard = FALSE;
+ bOnBoard = false;
if ( m_object->RetSelect() &&
m_camera->RetType() == CAMERA_ONBOARD )
{
- bOnBoard = TRUE;
+ bOnBoard = true;
}
s = m_physics->RetLinMotionX(MO_MOTSPEED)*1.5f;
@@ -1917,25 +1917,25 @@ BOOL CMotionVehicle::EventFrameInsect(const Event &event) SetInclinaison(dir);
}
- return TRUE;
+ return true;
}
// Event management for a insect cannon.
-BOOL CMotionVehicle::EventFrameCanoni(const Event &event)
+bool CMotionVehicle::EventFrameCanoni(const Event &event)
{
CObject* power;
D3DVECTOR pos, speed;
FPOINT dim;
float zoom, angle, energy, factor;
- BOOL bOnBoard = FALSE;
+ bool bOnBoard = false;
m_canonTime += event.rTime;
if ( m_object->RetSelect() &&
m_camera->RetType() == CAMERA_ONBOARD )
{
- bOnBoard = TRUE;
+ bOnBoard = true;
}
power = m_object->RetPower();
@@ -1947,7 +1947,7 @@ BOOL CMotionVehicle::EventFrameCanoni(const Event &event) {
energy = power->RetEnergy();
}
- if ( energy == 0.0f ) return TRUE;
+ if ( energy == 0.0f ) return true;
factor = 0.5f+energy*0.5f;
if ( bOnBoard ) factor *= 0.8f;
@@ -1992,7 +1992,7 @@ BOOL CMotionVehicle::EventFrameCanoni(const Event &event) }
#endif
- return TRUE;
+ return true;
}
@@ -2056,12 +2056,12 @@ void CMotionVehicle::UpdateTrackMapping(float left, float right, ObjectType type // State management of the pencil drawing robot.
-BOOL CMotionVehicle::RetTraceDown()
+bool CMotionVehicle::RetTraceDown()
{
return m_bTraceDown;
}
-void CMotionVehicle::SetTraceDown(BOOL bDown)
+void CMotionVehicle::SetTraceDown(bool bDown)
{
m_bTraceDown = bDown;
}
diff --git a/src/object/motion/motionvehicle.h b/src/object/motion/motionvehicle.h index 23e6ebc..b9ac0c9 100644 --- a/src/object/motion/motionvehicle.h +++ b/src/object/motion/motionvehicle.h @@ -39,12 +39,12 @@ public: CMotionVehicle(CInstanceManager* iMan, CObject* object);
~CMotionVehicle();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
- BOOL RetTraceDown();
- void SetTraceDown(BOOL bDown);
+ bool RetTraceDown();
+ void SetTraceDown(bool bDown);
int RetTraceColor();
void SetTraceColor(int color);
float RetTraceWidth();
@@ -52,10 +52,10 @@ public: protected:
void CreatePhysics(ObjectType type);
- BOOL EventFrame(const Event &event);
- BOOL EventFrameFly(const Event &event);
- BOOL EventFrameInsect(const Event &event);
- BOOL EventFrameCanoni(const Event &event);
+ bool EventFrame(const Event &event);
+ bool EventFrameFly(const Event &event);
+ bool EventFrameInsect(const Event &event);
+ bool EventFrameCanoni(const Event &event);
void UpdateTrackMapping(float left, float right, ObjectType type);
protected:
@@ -71,8 +71,8 @@ protected: D3DVECTOR m_wheelLastPos;
D3DVECTOR m_wheelLastAngle;
D3DVECTOR m_posKey;
- BOOL m_bFlyFix;
- BOOL m_bTraceDown;
+ bool m_bFlyFix;
+ bool m_bTraceDown;
int m_traceColor;
float m_traceWidth;
};
diff --git a/src/object/motion/motionworm.cpp b/src/object/motion/motionworm.cpp index 03c6a12..dc33e6e 100644 --- a/src/object/motion/motionworm.cpp +++ b/src/object/motion/motionworm.cpp @@ -69,7 +69,7 @@ CMotionWorm::CMotionWorm(CInstanceManager* iMan, CObject* object) m_armLastAction = -1;
m_specAction = -1;
m_lastParticule = 0.0f;
- m_bArmStop = FALSE;
+ m_bArmStop = false;
}
// Object's destructor.
@@ -81,21 +81,21 @@ CMotionWorm::~CMotionWorm() // Removes an object.
-void CMotionWorm::DeleteObject(BOOL bAll)
+void CMotionWorm::DeleteObject(bool bAll)
{
}
// Creates a vehicle traveling any lands on the ground.
-BOOL CMotionWorm::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionWorm::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
int rank, i;
float px;
- if ( m_engine->RetRestCreate() < 2+WORM_PART+1 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 2+WORM_PART+1 ) return false;
pModFile = new CModFile(m_iMan);
@@ -159,7 +159,7 @@ BOOL CMotionWorm::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the physics of the object.
@@ -199,21 +199,21 @@ void CMotionWorm::CreatePhysics() // Specifies a special parameter.
-BOOL CMotionWorm::SetParam(int rank, float value)
+bool CMotionWorm::SetParam(int rank, float value)
{
if ( rank == 0 )
{
m_timeDown = value;
- return TRUE;
+ return true;
}
if ( rank == 1 )
{
m_timeUp = value;
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
float CMotionWorm::RetParam(int rank)
@@ -227,7 +227,7 @@ float CMotionWorm::RetParam(int rank) // Management of an event.
-BOOL CMotionWorm::EventProcess(const Event &event)
+bool CMotionWorm::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -240,12 +240,12 @@ BOOL CMotionWorm::EventProcess(const Event &event) {
}
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CMotionWorm::EventFrame(const Event &event)
+bool CMotionWorm::EventFrame(const Event &event)
{
D3DMATRIX* mat;
D3DVECTOR pos, p, angle, speed;
@@ -254,7 +254,7 @@ BOOL CMotionWorm::EventFrame(const Event &event) float floor, a, s, px, curve, phase, h, zoom, radius;
int i, under;
- if ( m_engine->RetPause() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
s = m_physics->RetLinMotionX(MO_MOTSPEED)/m_physics->RetLinMotionX(MO_ADVSPEED);
a = m_physics->RetCirMotionY(MO_MOTSPEED)/m_physics->RetCirMotionY(MO_ADVSPEED);
@@ -297,10 +297,10 @@ BOOL CMotionWorm::EventFrame(const Event &event) }
m_object->SetVisible(under!=WORM_PART+2);
- if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return TRUE;
+ if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return true;
pos = m_object->RetPosition(0);
- floor = m_terrain->RetFloorLevel(pos, TRUE);
+ floor = m_terrain->RetFloorLevel(pos, true);
mat = m_object->RetWorldMatrix(0);
@@ -328,7 +328,7 @@ BOOL CMotionWorm::EventFrame(const Event &event) pos.z = pp.y;
p = Transform(*mat, pos);
- pos.y += m_terrain->RetFloorLevel(p, TRUE)-floor;
+ pos.y += m_terrain->RetFloorLevel(p, true)-floor;
m_object->SetPosition(i+1, pos);
zoom = Mod(m_armTimeAbs*0.5f+100.0f-i*0.1f, 2.0f);
@@ -372,7 +372,7 @@ BOOL CMotionWorm::EventFrame(const Event &event) }
}
- return TRUE;
+ return true;
}
diff --git a/src/object/motion/motionworm.h b/src/object/motion/motionworm.h index 3422e49..6dca520 100644 --- a/src/object/motion/motionworm.h +++ b/src/object/motion/motionworm.h @@ -39,16 +39,16 @@ public: CMotionWorm(CInstanceManager* iMan, CObject* object);
~CMotionWorm();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
- BOOL SetParam(int rank, float value);
+ bool SetParam(int rank, float value);
float RetParam(int rank);
protected:
void CreatePhysics();
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
float m_timeUp;
@@ -66,7 +66,7 @@ protected: float m_armCirSpeed;
int m_specAction;
float m_specTime;
- BOOL m_bArmStop;
+ bool m_bArmStop;
float m_lastParticule;
};
|