diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-09-27 18:26:29 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-09-27 18:26:29 +0200 |
| commit | b3fa72c0071b965ffe5f4b1d68e9fb5d0cd99dcd (patch) | |
| tree | 88afa9808528a2031c9a86efea9f8155a9d0dba7 /src/object | |
| parent | 32504be8a95e09736a84bdacd873d48fa971c055 (diff) | |
| download | colobot-b3fa72c0071b965ffe5f4b1d68e9fb5d0cd99dcd.tar.gz colobot-b3fa72c0071b965ffe5f4b1d68e9fb5d0cd99dcd.tar.bz2 colobot-b3fa72c0071b965ffe5f4b1d68e9fb5d0cd99dcd.zip | |
Moved effect??.png textures and made pos= in GroundSpot optional
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/robotmain.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 5499cc9..6fda290 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -4689,7 +4689,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) rank = m_engine->CreateGroundSpot(); if (rank != -1) { - m_engine->SetObjectGroundSpotPos(rank, line->GetParam("pos")->AsPoint()*g_unit); + m_engine->SetObjectGroundSpotPos(rank, line->GetParam("pos")->AsPoint(Math::Vector(0.0f, 0.0f, 0.0f))*g_unit); m_engine->SetObjectGroundSpotRadius(rank, line->GetParam("radius")->AsFloat(10.0f)*g_unit); m_engine->SetObjectGroundSpotColor(rank, line->GetParam("color")->AsColor(Gfx::Color(0.533f, 0.533f, 0.533f, 0.533f))); m_engine->SetObjectGroundSpotSmooth(rank, line->GetParam("smooth")->AsFloat(1.0f)); @@ -5102,12 +5102,12 @@ void CRobotMain::ChangeColor() // PARTIPLOUF0 and PARTIDROP : ts = Math::Point(0.500f, 0.500f); ti = Math::Point(0.875f, 0.750f); - m_engine->ChangeTextureColor("textures/interface/effect00.png", m_colorRefWater, m_colorNewWater, colorRef2, colorNew2, 0.20f, -1.0f, ts, ti, 0, m_colorShiftWater, true); + m_engine->ChangeTextureColor("textures/effect00.png", m_colorRefWater, m_colorNewWater, colorRef2, colorNew2, 0.20f, -1.0f, ts, ti, 0, m_colorShiftWater, true); // PARTIFLIC : ts = Math::Point(0.00f, 0.75f); ti = Math::Point(0.25f, 1.00f); - m_engine->ChangeTextureColor("textures/interface/effect02.png", m_colorRefWater, m_colorNewWater, colorRef2, colorNew2, 0.20f, -1.0f, ts, ti, 0, m_colorShiftWater, true); + m_engine->ChangeTextureColor("textures/effect02.png", m_colorRefWater, m_colorNewWater, colorRef2, colorNew2, 0.20f, -1.0f, ts, ti, 0, m_colorShiftWater, true); } //! Updates the number of unnecessary objects |