immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of "blacklisting shadowXX.png" logs

master
Piotr Dziwinski 2015-08-22 18:17:57 +02:00
parent c3d4d46583
commit 60f0a7b45c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/graphics/engine/engine.cpp
View File

@ -59,7 +59,7 @@
#include "ui/controls/interface.h" #include "ui/controls/interface.h"
#include <iomanip> #include <iomanip>
#include <SDL_thread.h> #include <boost/algorithm/string/predicate.hpp>
template<> Gfx::CEngine* CSingleton<Gfx::CEngine>::m_instance = nullptr; template<> Gfx::CEngine* CSingleton<Gfx::CEngine>::m_instance = nullptr;
@ -2317,7 +2317,12 @@ bool CEngine::LoadAllTextures()
if (! p2.tex2Name.empty()) if (! p2.tex2Name.empty())
{ {
if (terrain) if (terrain)
p2.tex2 = LoadTexture("textures/"+p2.tex2Name, m_terrainTexParams); {
if (! boost::starts_with(p2.tex2Name, "shadow")) // shadow ground textures are created dynamically
{
p2.tex2 = LoadTexture("textures/"+p2.tex2Name, m_terrainTexParams);
}
}
else else
p2.tex2 = LoadTexture("textures/"+p2.tex2Name); p2.tex2 = LoadTexture("textures/"+p2.tex2Name);