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/water.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/water.h')
-rw-r--r-- | src/graphics/engine/water.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/graphics/engine/water.h b/src/graphics/engine/water.h index b051889..f20f992 100644 --- a/src/graphics/engine/water.h +++ b/src/graphics/engine/water.h @@ -165,8 +165,8 @@ protected: //! Size of a item in an brick float m_size; - std::vector<WaterLine> m_line; - std::vector<WaterVapor> m_vapor; + std::vector<WaterLine> m_lines; + std::vector<WaterVapor> m_vapors; bool m_draw; bool m_lava; |