From e91ecbbb01cbe52e1567af3d15cebf36a509d2c1 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Tue, 18 Aug 2015 22:56:18 +0200 Subject: [PATCH] Removed unused references to effect03.png from the code --- data | 2 +- src/graphics/engine/text.cpp | 8 +------- src/ui/controls/control.cpp | 9 +-------- src/ui/controls/shortcut.cpp | 7 +------ 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/data b/data index 2ee08c53..e3a875c4 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 2ee08c5397658bbebe5d1593472fdd67a7b2778c +Subproject commit e3a875c413d89eaff501c9400e126dd8410d6298 diff --git a/src/graphics/engine/text.cpp b/src/graphics/engine/text.cpp index 3ef0a53b..686c0d1b 100644 --- a/src/graphics/engine/text.cpp +++ b/src/graphics/engine/text.cpp @@ -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 unsigned char icon = static_cast(ch.c1); - if ( icon >= 192 ) - { - icon -= 192; - m_engine->SetTexture("textures/effect03.png"); - m_engine->SetState(ENG_RSTATE_TTEXTURE_WHITE); - } - else if ( icon >= 128 ) + if ( icon >= 128 ) { icon -= 128; m_engine->SetTexture("textures/interface/button3.png"); diff --git a/src/ui/controls/control.cpp b/src/ui/controls/control.cpp index bf8662cc..60e635eb 100644 --- a/src/ui/controls/control.cpp +++ b/src/ui/controls/control.cpp @@ -515,13 +515,7 @@ void CControl::Draw() if ( m_state & STATE_DEAD ) return; icon = m_icon; - if ( icon >= 192 ) - { - icon -= 192; - m_engine->SetTexture("textures/effect03.png"); - m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE); - } - else if ( icon >= 128 ) + if ( icon >= 128 ) { icon -= 128; m_engine->SetTexture("textures/interface/button3.png"); @@ -856,4 +850,3 @@ std::string CControl::GetResourceName(EventType eventType) } - diff --git a/src/ui/controls/shortcut.cpp b/src/ui/controls/shortcut.cpp index afe76ed0..a8c9d268 100644 --- a/src/ui/controls/shortcut.cpp +++ b/src/ui/controls/shortcut.cpp @@ -125,12 +125,7 @@ void CShortcut::Draw() } icon = m_icon; - if ( icon >= 192 ) - { - icon -= 192; - m_engine->SetTexture("textures/effect03.png"); - } - else if ( icon >= 128 ) + if ( icon >= 128 ) { icon -= 128; m_engine->SetTexture("textures/interface/button3.png");