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/graphics/common/water.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/graphics/common/water.h')
-rw-r--r-- | src/graphics/common/water.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/graphics/common/water.h b/src/graphics/common/water.h index 959b12f..c0593a0 100644 --- a/src/graphics/common/water.h +++ b/src/graphics/common/water.h @@ -44,7 +44,7 @@ WaterLine; typedef struct
{
- BOOL bUsed;
+ bool bUsed;
ParticuleType type;
D3DVECTOR pos;
float delay;
@@ -71,30 +71,30 @@ public: ~CWater();
void SetD3DDevice(LPDIRECT3DDEVICE7 device);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Flush();
- BOOL Create(WaterType type1, WaterType type2, const char *filename, D3DCOLORVALUE diffuse, D3DCOLORVALUE ambient, float level, float glint, D3DVECTOR eddy);
+ bool Create(WaterType type1, WaterType type2, const char *filename, D3DCOLORVALUE diffuse, D3DCOLORVALUE ambient, float level, float glint, D3DVECTOR eddy);
void DrawBack();
void DrawSurf();
- BOOL SetLevel(float level);
+ bool SetLevel(float level);
float RetLevel();
float RetLevel(CObject* object);
- void SetLava(BOOL bLava);
- BOOL RetLava();
+ void SetLava(bool bLava);
+ bool RetLava();
void AdjustEye(D3DVECTOR &eye);
protected:
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
void LavaFrame(float rTime);
void AdjustLevel(D3DVECTOR &pos, D3DVECTOR &norm, FPOINT &uv1, FPOINT &uv2);
- BOOL RetWater(int x, int y);
- BOOL CreateLine(int x, int y, int len);
+ bool RetWater(int x, int y);
+ bool CreateLine(int x, int y, int len);
void VaporFlush();
- BOOL VaporCreate(ParticuleType type, D3DVECTOR pos, float delay);
+ bool VaporCreate(ParticuleType type, D3DVECTOR pos, float delay);
void VaporFrame(int i, float rTime);
protected:
@@ -124,8 +124,8 @@ protected: WaterVapor m_vapor[MAXWATVAPOR];
- BOOL m_bDraw;
- BOOL m_bLava;
+ bool m_bDraw;
+ bool m_bLava;
D3DCOLOR m_color;
};
|