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/graphics | |
| 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/graphics')
| -rw-r--r-- | src/graphics/engine/engine.cpp | 6 | ||||
| -rw-r--r-- | src/graphics/engine/lightning.cpp | 2 | ||||
| -rw-r--r-- | src/graphics/engine/particle.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
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 = ""; } |