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/tasktake.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/tasktake.h')
-rw-r--r-- | src/object/task/tasktake.h | 14 |
1 files changed, 7 insertions, 7 deletions
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;
};
|