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

Removed unused references to effect03.png from the code

master
krzys-h 2015-08-18 22:56:18 +02:00
parent 371621ced4
commit e91ecbbb01
4 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data

@ -1 +1 @@
Subproject commit 2ee08c5397658bbebe5d1593472fdd67a7b2778c Subproject commit e3a875c413d89eaff501c9400e126dd8410d6298

8
src/graphics/engine/text.cpp
View File

@ -852,13 +852,7 @@ void CText::DrawCharAndAdjustPos(UTF8Char ch, FontType font, float size, Math::P
// For whatever reason ch.c1 is a SIGNED char, we need to fix that // For whatever reason ch.c1 is a SIGNED char, we need to fix that
unsigned char icon = static_cast<unsigned char>(ch.c1); unsigned char icon = static_cast<unsigned char>(ch.c1);
if ( icon >= 192 ) if ( icon >= 128 )
{
icon -= 192;
m_engine->SetTexture("textures/effect03.png");
m_engine->SetState(ENG_RSTATE_TTEXTURE_WHITE);
}
else if ( icon >= 128 )
{ {
icon -= 128; icon -= 128;
m_engine->SetTexture("textures/interface/button3.png"); m_engine->SetTexture("textures/interface/button3.png");

9
src/ui/controls/control.cpp
View File

@ -515,13 +515,7 @@ void CControl::Draw()
if ( m_state & STATE_DEAD ) return; if ( m_state & STATE_DEAD ) return;
icon = m_icon; icon = m_icon;
if ( icon >= 192 ) if ( icon >= 128 )
{
icon -= 192;
m_engine->SetTexture("textures/effect03.png");
m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
}
else if ( icon >= 128 )
{ {
icon -= 128; icon -= 128;
m_engine->SetTexture("textures/interface/button3.png"); m_engine->SetTexture("textures/interface/button3.png");
@ -856,4 +850,3 @@ std::string CControl::GetResourceName(EventType eventType)
} }

7
src/ui/controls/shortcut.cpp
View File

@ -125,12 +125,7 @@ void CShortcut::Draw()
} }
icon = m_icon; icon = m_icon;
if ( icon >= 192 ) if ( icon >= 128 )
{
icon -= 192;
m_engine->SetTexture("textures/effect03.png");
}
else if ( icon >= 128 )
{ {
icon -= 128; icon -= 128;
m_engine->SetTexture("textures/interface/button3.png"); m_engine->SetTexture("textures/interface/button3.png");