From ebed57aa22b772211387a5561f995eee8f5faed1 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Tue, 26 Jun 2012 22:23:05 +0200
Subject: Whitespace and language change

- changed tabs to spaces and DOS line endings to Unix
  (except in CBot and metafile)
- changed language to English
- fixed #include <d3d.h> in d3dengine.h
---
 src/graphics/common/water.h | 130 ++++++++++++++++++++++----------------------
 1 file changed, 65 insertions(+), 65 deletions(-)

(limited to 'src/graphics/common/water.h')

diff --git a/src/graphics/common/water.h b/src/graphics/common/water.h
index aaf5ec9..5999eac 100644
--- a/src/graphics/common/water.h
+++ b/src/graphics/common/water.h
@@ -37,9 +37,9 @@ const short MAXWATERLINE = 500;
 
 struct WaterLine
 {
-	short		x, y;		// beginning
-	short		len;		// length by x
-	float		px1, px2, pz;
+    short       x, y;       // beginning
+    short       len;        // length by x
+    float       px1, px2, pz;
 };
 
 
@@ -47,88 +47,88 @@ const short MAXWATVAPOR = 10;
 
 struct WaterVapor
 {
-	bool			bUsed;
-	ParticuleType	type;
-	Math::Vector		pos;
-	float			delay;
-	float			time;
-	float			last;
+    bool            bUsed;
+    ParticuleType   type;
+    Math::Vector        pos;
+    float           delay;
+    float           time;
+    float           last;
 };
 
 
 enum WaterType
 {
-	WATER_NULL		= 0,	// no water
-	WATER_TT		= 1,	// transparent texture
-	WATER_TO		= 2,	// opaque texture
-	WATER_CT		= 3,	// transparent color
-	WATER_CO		= 4,	// opaque color
+    WATER_NULL      = 0,    // no water
+    WATER_TT        = 1,    // transparent texture
+    WATER_TO        = 2,    // opaque texture
+    WATER_CT        = 3,    // transparent color
+    WATER_CO        = 4,    // opaque color
 };
 
 
 class CWater
 {
 public:
-	CWater(CInstanceManager* iMan, Gfx::CEngine* engine);
-	~CWater();
+    CWater(CInstanceManager* iMan, Gfx::CEngine* engine);
+    ~CWater();
 
-	void		SetGLDevice(Gfx::CDevice device);
-	bool		EventProcess(const Event &event);
-	void		Flush();
-	bool		Create(WaterType type1, WaterType type2, const char *filename, Gfx::Color diffuse, Gfx::Color ambient, float level, float glint, Math::Vector eddy);
-	void		DrawBack();
-	void		DrawSurf();
+    void        SetGLDevice(Gfx::CDevice device);
+    bool        EventProcess(const Event &event);
+    void        Flush();
+    bool        Create(WaterType type1, WaterType type2, const char *filename, Gfx::Color diffuse, Gfx::Color ambient, float level, float glint, Math::Vector eddy);
+    void        DrawBack();
+    void        DrawSurf();
 
-	bool		SetLevel(float level);
-	float		RetLevel();
-	float		RetLevel(CObject* object);
+    bool        SetLevel(float level);
+    float       RetLevel();
+    float       RetLevel(CObject* object);
 
-	void		SetLava(bool bLava);
-	bool		RetLava();
+    void        SetLava(bool bLava);
+    bool        RetLava();
 
-	void		AdjustEye(Math::Vector &eye);
+    void        AdjustEye(Math::Vector &eye);
 
 protected:
-	bool		EventFrame(const Event &event);
-	void		LavaFrame(float rTime);
-	void		AdjustLevel(Math::Vector &pos, Math::Vector &norm, Math::Point &uv1, Math::Point &uv2);
-	bool		RetWater(int x, int y);
-	bool		CreateLine(int x, int y, int len);
+    bool        EventFrame(const Event &event);
+    void        LavaFrame(float rTime);
+    void        AdjustLevel(Math::Vector &pos, Math::Vector &norm, Math::Point &uv1, Math::Point &uv2);
+    bool        RetWater(int x, int y);
+    bool        CreateLine(int x, int y, int len);
 
-	void		VaporFlush();
-	bool		VaporCreate(ParticuleType type, Math::Vector pos, float delay);
-	void		VaporFrame(int i, float rTime);
+    void        VaporFlush();
+    bool        VaporCreate(ParticuleType type, Math::Vector pos, float delay);
+    void        VaporFrame(int i, float rTime);
 
 protected:
-	CInstanceManager*	m_iMan;
-	CEngine*		m_engine;
-	CDevice*			m_pDevice;
-	CTerrain*			m_terrain;
-	CParticle*			m_particule;
-	CSound*				m_sound;
-
-	WaterType		m_type[2];
-	char			m_filename[100];
-	float			m_level;		// overall level
-	float			m_glint;		// amplitude of reflections
-	Math::Vector		m_eddy;			// amplitude of swirls
-	Gfx::Color		m_diffuse;		// diffuse color
-	Gfx::Color		m_ambient;		// ambient color
-	float			m_time;
-	float			m_lastLava;
-	int			m_subdiv;
-
-	int			m_brick;		// number of brick*mosaics
-	float			m_size;			// size of a item in an brick
-
-	int			m_lineUsed;
-	WaterLine		m_line[MAXWATERLINE];
-
-	WaterVapor		m_vapor[MAXWATVAPOR];
-
-	bool			m_bDraw;
-	bool			m_bLava;
-	long		m_color;
+    CInstanceManager*   m_iMan;
+    CEngine*        m_engine;
+    CDevice*            m_pDevice;
+    CTerrain*           m_terrain;
+    CParticle*          m_particule;
+    CSound*             m_sound;
+
+    WaterType       m_type[2];
+    char            m_filename[100];
+    float           m_level;        // overall level
+    float           m_glint;        // amplitude of reflections
+    Math::Vector        m_eddy;         // amplitude of swirls
+    Gfx::Color      m_diffuse;      // diffuse color
+    Gfx::Color      m_ambient;      // ambient color
+    float           m_time;
+    float           m_lastLava;
+    int         m_subdiv;
+
+    int         m_brick;        // number of brick*mosaics
+    float           m_size;         // size of a item in an brick
+
+    int         m_lineUsed;
+    WaterLine       m_line[MAXWATERLINE];
+
+    WaterVapor      m_vapor[MAXWATVAPOR];
+
+    bool            m_bDraw;
+    bool            m_bLava;
+    long        m_color;
 };
 
 }; // namespace Gfx
-- 
cgit v1.2.3-1-g7c22