diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-26 23:08:41 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-26 23:08:41 +0200 |
| commit | 77bd13f49fb974cb50918b18d166ab61240c0d34 (patch) | |
| tree | 2a824960ef146e23ca772c8dc0215e70f586ed8f /src/old/terrain.cpp | |
| parent | 6a059b437dca706a72233a57ba4c22011aba6dde (diff) | |
| parent | c2a7375788aea0cf1c0f4c45e4823a8a9a85264d (diff) | |
| download | colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.tar.gz colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.tar.bz2 colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.zip | |
Merge branch 'dev-opengl' into dev
Diffstat (limited to 'src/old/terrain.cpp')
| -rw-r--r-- | src/old/terrain.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/old/terrain.cpp b/src/old/terrain.cpp index 2f2250c..9804261 100644 --- a/src/old/terrain.cpp +++ b/src/old/terrain.cpp @@ -108,7 +108,7 @@ CTerrain::~CTerrain() // +---+---o---+---+---> x // | | | | | // | | | | | -// +---+---+---+---+ +// +---+---+---+---+ // | | | | | The land is viewed from above here. // | | | | | // +---+---+---+---+ @@ -759,7 +759,7 @@ D3DVERTEX2 CTerrain::RetVertex(int x, int y, int step) // | // +-------------------> x -bool CTerrain::CreateMosaic(int ox, int oy, int step, int objRank, +bool CTerrain::CreateMosaic(int ox, int oy, int step, int objRank, const D3DMATERIAL7 &mat, float min, float max) { @@ -1794,7 +1794,7 @@ float CTerrain::RetFloorLevel(const Math::Vector &p, bool bBrut, bool bWater) return ps.y; } -// Returns the height to the ground. +// Returns the height to the ground. // This height is positive when you are above the ground. float CTerrain::RetFloorHeight(const Math::Vector &p, bool bBrut, bool bWater) |