diff options
author | krzys-h <krzys_h@interia.pl> | 2014-07-24 22:17:49 +0200 |
---|---|---|
committer | krzys-h <krzys_h@interia.pl> | 2014-07-24 22:17:49 +0200 |
commit | 7131abd385bb370328e7c59e8a6b70d160b2effc (patch) | |
tree | b2f4313fa45eefeda6cb1ee38bf48950584c5c71 /src/graphics/engine/water.cpp | |
parent | 02ba358a892b9977250ea345c42f8226f89ba250 (diff) | |
download | colobot-7131abd385bb370328e7c59e8a6b70d160b2effc.tar.gz colobot-7131abd385bb370328e7c59e8a6b70d160b2effc.tar.bz2 colobot-7131abd385bb370328e7c59e8a6b70d160b2effc.zip |
Fixed SatCom image loading
Now LoadTexture/SetTexture functions require full path with "textures/" directory
Diffstat (limited to 'src/graphics/engine/water.cpp')
-rw-r--r-- | src/graphics/engine/water.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/graphics/engine/water.cpp b/src/graphics/engine/water.cpp index d1f8d29..cb0c43f 100644 --- a/src/graphics/engine/water.cpp +++ b/src/graphics/engine/water.cpp @@ -348,8 +348,8 @@ void CWater::DrawSurf() material.ambient = m_ambient; m_engine->SetMaterial(material); - m_engine->SetTexture(m_fileName, 0); - m_engine->SetTexture(m_fileName, 1); + m_engine->SetTexture("textures/"+m_fileName, 0); + m_engine->SetTexture("textures/"+m_fileName, 1); if (m_type[rankview] == WATER_TT) m_engine->SetState(ENG_RSTATE_TTEXTURE_BLACK | ENG_RSTATE_DUAL_WHITE | ENG_RSTATE_WRAP, m_color); @@ -492,7 +492,7 @@ void CWater::Create(WaterType type1, WaterType type2, const std::string& fileNam VaporFlush(); if (! m_fileName.empty()) - m_engine->LoadTexture(m_fileName); + m_engine->LoadTexture("textures/"+m_fileName); if (m_terrain == nullptr) m_terrain = CRobotMain::GetInstancePointer()->GetTerrain(); |