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

Revert "Get rid of "blacklisting shadowXX.png" logs" 

This disabled loading of those textures completly

This reverts commit 60f0a7b45c.

 #BlamePiotrdzAgain
dev-time-step
krzys-h 2016-02-28 20:17:35 +01:00
parent 14d6ee74a3
commit 643c40e778
1 changed files with 2 additions and 7 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 <iomanip>
#include <boost/algorithm/string/predicate.hpp>
#include <SDL_thread.h>
template<> Gfx::CEngine* CSingleton<Gfx::CEngine>::m_instance = nullptr;
@ -2326,12 +2326,7 @@ bool CEngine::LoadAllTextures()
if (! p2.tex2Name.empty())
{
if (terrain)
{
if (! boost::starts_with(p2.tex2Name, "shadow")) // shadow ground textures are created dynamically
{
p2.tex2 = LoadTexture("textures/"+p2.tex2Name, m_terrainTexParams);
}
}
p2.tex2 = LoadTexture("textures/"+p2.tex2Name, m_terrainTexParams);
else
p2.tex2 = LoadTexture("textures/"+p2.tex2Name);