immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed water/lava moving and waves (#659)

dev-time-step
krzys-h 2015-09-30 20:31:09 +02:00
parent 2f0ec3fe75
commit 95f1e3f19a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/graphics/engine/water.cpp
View File

@ -45,7 +45,6 @@ namespace Gfx
namespace namespace
{ {
const int WATERLINE_PREALLOCATE_COUNT = 500; const int WATERLINE_PREALLOCATE_COUNT = 500;
// TODO: remove the limit?
const int VAPOR_SIZE = 10; const int VAPOR_SIZE = 10;
} // anonymous namespace } // anonymous namespace

4
src/level/robotmain.cpp
View File

@ -3222,8 +3222,8 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
if (line->GetCommand() == "TerrainWater" && !resetObject) if (line->GetCommand() == "TerrainWater" && !resetObject)
{ {
Math::Vector pos; Math::Vector pos;
pos.x = line->GetParam("moxeX")->AsFloat(0.0f); pos.x = line->GetParam("moveX")->AsFloat(0.0f);
pos.y = line->GetParam("moxeY")->AsFloat(0.0f); pos.y = line->GetParam("moveY")->AsFloat(0.0f);
pos.z = pos.x; pos.z = pos.x;
m_water->Create(line->GetParam("air")->AsWaterType(Gfx::WATER_TT), m_water->Create(line->GetParam("air")->AsWaterType(Gfx::WATER_TT),
line->GetParam("water")->AsWaterType(Gfx::WATER_TT), line->GetParam("water")->AsWaterType(Gfx::WATER_TT),