[colobot] 26/377: Fixed water/lava moving and waves (#659)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 95f1e3f19af3dba078e8ce69fdeebe9890513aef
Author: krzys-h <krzys_h at interia.pl>
Date:   Wed Sep 30 20:31:09 2015 +0200

    Fixed water/lava moving and waves (#659)
---
 src/graphics/engine/water.cpp | 1 -
 src/level/robotmain.cpp       | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/graphics/engine/water.cpp b/src/graphics/engine/water.cpp
index 28b64f8..84bc969 100644
--- a/src/graphics/engine/water.cpp
+++ b/src/graphics/engine/water.cpp
@@ -45,7 +45,6 @@ namespace Gfx
 namespace
 {
 const int WATERLINE_PREALLOCATE_COUNT = 500;
-// TODO: remove the limit?
 const int VAPOR_SIZE = 10;
 } // anonymous namespace
 
diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp
index 98da4e8..ba182b5 100644
--- a/src/level/robotmain.cpp
+++ b/src/level/robotmain.cpp
@@ -3222,8 +3222,8 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
             if (line->GetCommand() == "TerrainWater" && !resetObject)
             {
                 Math::Vector pos;
-                pos.x = line->GetParam("moxeX")->AsFloat(0.0f);
-                pos.y = line->GetParam("moxeY")->AsFloat(0.0f);
+                pos.x = line->GetParam("moveX")->AsFloat(0.0f);
+                pos.y = line->GetParam("moveY")->AsFloat(0.0f);
                 pos.z = pos.x;
                 m_water->Create(line->GetParam("air")->AsWaterType(Gfx::WATER_TT),
                                 line->GetParam("water")->AsWaterType(Gfx::WATER_TT),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git