summaryrefslogtreecommitdiffstats
path: root/src/graphics/engine/engine.cpp
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2014-07-10 16:25:40 +0200
committerkrzys-h <krzys_h@interia.pl>2014-07-10 16:25:40 +0200
commit106ec014b812c6f5eb93ea30c04b3bba333542dd (patch)
tree72b2fcf4bdc32ec82d3829fd4cab5185e5f9d61a /src/graphics/engine/engine.cpp
parent7b04f673580f0c24aecc103a25c4c4b82da1380f (diff)
downloadcolobot-106ec014b812c6f5eb93ea30c04b3bba333542dd.tar.gz
colobot-106ec014b812c6f5eb93ea30c04b3bba333542dd.tar.bz2
colobot-106ec014b812c6f5eb93ea30c04b3bba333542dd.zip
Fixed texture and script loading
Diffstat (limited to 'src/graphics/engine/engine.cpp')
-rw-r--r--src/graphics/engine/engine.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp
index 6f6141b..2745068 100644
--- a/src/graphics/engine/engine.cpp
+++ b/src/graphics/engine/engine.cpp
@@ -282,7 +282,7 @@ bool CEngine::Create()
params.minFilter = TEX_MIN_FILTER_NEAREST;
params.magFilter = TEX_MAG_FILTER_NEAREST;
params.mipmap = false;
- m_miceTexture = LoadTexture("textures/interface/mouse.png", params);
+ m_miceTexture = LoadTexture("interface/mouse.png", params);
GetSystemUtils()->GetCurrentTimeStamp(m_currentFrameTime);
GetSystemUtils()->GetCurrentTimeStamp(m_lastFrameTime);
@@ -2246,7 +2246,7 @@ Texture CEngine::CreateTexture(const std::string& texName, const TextureCreatePa
if (image == nullptr)
{
- if (!img.Load(texName))
+ if (!img.Load("textures/"+texName))
{
std::string error = img.GetError();
GetLogger()->Error("Couldn't load texture '%s': %s, blacklisting\n", texName.c_str(), error.c_str());
@@ -2297,15 +2297,15 @@ Texture CEngine::LoadTexture(const std::string& name, const TextureCreateParams&
bool CEngine::LoadAllTextures()
{
- LoadTexture("textures/interface/text.png");
- m_miceTexture = LoadTexture("textures/interface/mouse.png");
- 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/interface/map.png");
+ LoadTexture("interface/text.png");
+ m_miceTexture = LoadTexture("interface/mouse.png");
+ LoadTexture("interface/button1.png");
+ LoadTexture("interface/button2.png");
+ LoadTexture("interface/button3.png");
+ LoadTexture("interface/effect00.png");
+ LoadTexture("interface/effect01.png");
+ LoadTexture("interface/effect02.png");
+ LoadTexture("interface/map.png");
if (! m_backgroundName.empty())
{
@@ -2414,7 +2414,7 @@ bool CEngine::ChangeTextureColor(const std::string& texName,
CImage img;
- if (!img.Load(texName))
+ if (!img.Load("textures/"+texName))
{
std::string error = img.GetError();
GetLogger()->Error("Couldn't load texture '%s': %s, blacklisting\n", texName.c_str(), error.c_str());
@@ -3773,7 +3773,7 @@ void CEngine::DrawShadow()
SetMaterial(material);
// TODO: create a separate texture
- SetTexture("textures/interface/text.png");
+ SetTexture("interface/text.png");
Math::Point ts, ti;