diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-08-12 19:30:31 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-08-12 19:30:31 +0200 |
| commit | 146ad47e4afbf1fe82763c94c2cd2209285f869f (patch) | |
| tree | 526bdbcd20655fa77b32dee18bf9debe6df10fc7 /src/graphics/engine/terrain.h | |
| parent | 6ab1746ec97ac12d00180c951248c45b1c57bd12 (diff) | |
| parent | 45a5e1e865ec02892054080e1fc0b7e7c463e9d3 (diff) | |
| download | colobot-146ad47e4afbf1fe82763c94c2cd2209285f869f.tar.gz colobot-146ad47e4afbf1fe82763c94c2cd2209285f869f.tar.bz2 colobot-146ad47e4afbf1fe82763c94c2cd2209285f869f.zip | |
Merge branch 'dev-graphics' into dev
CEngine object handling
Diffstat (limited to 'src/graphics/engine/terrain.h')
| -rw-r--r-- | src/graphics/engine/terrain.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/graphics/engine/terrain.h b/src/graphics/engine/terrain.h index 41d4bbb..0c7e3cf 100644 --- a/src/graphics/engine/terrain.h +++ b/src/graphics/engine/terrain.h @@ -273,8 +273,8 @@ protected: std::string m_texBaseExt; float m_defHardness; - std::vector<TerrainMaterial> m_levelMat; - std::vector<Gfx::DotLevel> m_levelDot; + std::vector<TerrainMaterial> m_levelMats; + std::vector<Gfx::DotLevel> m_levelDots; int m_levelMatMax; int m_levelID; |