[colobot] 69/390: Moved effect??.png textures and made pos= in GroundSpot optional

[Didier Raboud]

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

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit b3fa72c0071b965ffe5f4b1d68e9fb5d0cd99dcd
Author: krzys-h <krzys_h at interia.pl>
Date:   Sat Sep 27 18:26:29 2014 +0200

    Moved effect??.png textures and made pos= in GroundSpot optional
---
 data                              | 2 +-
 src/graphics/engine/engine.cpp    | 6 +++---
 src/graphics/engine/lightning.cpp | 2 +-
 src/graphics/engine/particle.cpp  | 6 +++---
 src/object/robotmain.cpp          | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data b/data
index 933ba19..314f1ea 160000
--- a/data
+++ b/data
@@ -1 +1 @@
-Subproject commit 933ba1930466880db0a751f64ce536ff1d55cb88
+Subproject commit 314f1eae8b72374f8234b450e340cad249e2e241
diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp
index 2996cb2..76db328 100644
--- a/src/graphics/engine/engine.cpp
+++ b/src/graphics/engine/engine.cpp
@@ -2313,9 +2313,9 @@ bool CEngine::LoadAllTextures()
     LoadTexture("textures/interface/button1.png");
     LoadTexture("textures/interface/button2.png");
     LoadTexture("textures/interface/button3.png");
-    LoadTexture("textures/interface/effect00.png");
-    LoadTexture("textures/interface/effect01.png");
-    LoadTexture("textures/interface/effect02.png");
+    LoadTexture("textures/effect00.png");
+    LoadTexture("textures/effect01.png");
+    LoadTexture("textures/effect02.png");
     LoadTexture("textures/interface/map.png");
 
     if (! m_backgroundName.empty())
diff --git a/src/graphics/engine/lightning.cpp b/src/graphics/engine/lightning.cpp
index 69d8a3c..b0d9561 100644
--- a/src/graphics/engine/lightning.cpp
+++ b/src/graphics/engine/lightning.cpp
@@ -235,7 +235,7 @@ void CLightning::Draw()
     mat.LoadIdentity();
     device->SetTransform(TRANSFORM_WORLD, mat);
 
-    m_engine->SetTexture("textures/interface/effect00.png");
+    m_engine->SetTexture("textures/effect00.png");
     m_engine->SetState(ENG_RSTATE_TTEXTURE_BLACK);
 
     Math::Point texInf;
diff --git a/src/graphics/engine/particle.cpp b/src/graphics/engine/particle.cpp
index 229385e..b0ce969 100644
--- a/src/graphics/engine/particle.cpp
+++ b/src/graphics/engine/particle.cpp
@@ -198,9 +198,9 @@ void CParticle::FlushParticle(int sheet)
 //! Returns file name of the effect effectNN.png, with NN = number
 void NameParticle(std::string &name, int num)
 {
-         if (num == 1)  name = "interface/effect00.png";
-    else if (num == 2)  name = "interface/effect01.png";
-    else if (num == 3)  name = "interface/effect02.png";
+         if (num == 1)  name = "effect00.png";
+    else if (num == 2)  name = "effect01.png";
+    else if (num == 3)  name = "effect02.png";
     else if (num == 4)  name = "interface/text.png";
     else                name = "";
 }
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

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