diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-10 15:28:12 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-10 15:28:12 +0200 |
commit | 697fbdabf10d956e0f13bfbc9414d3db40f0c535 (patch) | |
tree | ab80ba3119d07b11da5478009b905edb702c103f /src/object/task/taskmanip.h | |
parent | 680af178196217bdd255d2bc851f240983144ac1 (diff) | |
download | colobot-697fbdabf10d956e0f13bfbc9414d3db40f0c535.tar.gz colobot-697fbdabf10d956e0f13bfbc9414d3db40f0c535.tar.bz2 colobot-697fbdabf10d956e0f13bfbc9414d3db40f0c535.zip |
BOOL -> bool; additional fixes in constructors/destructors
Diffstat (limited to 'src/object/task/taskmanip.h')
-rw-r--r-- | src/object/task/taskmanip.h | 24 |
1 files changed, 12 insertions, 12 deletions
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;
|