summaryrefslogtreecommitdiffstats
path: root/src/ui/color.cpp
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-09-16 10:38:08 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-09-16 10:38:08 +0200
commit6a0d150539897ec65ccc161305db48de10ea35ba (patch)
tree7064e569459bd8d704edd28552f48bf2978d61a0 /src/ui/color.cpp
parentaf9af56bb007050c969af310c4e816d260b9ce7f (diff)
downloadcolobot-6a0d150539897ec65ccc161305db48de10ea35ba.tar.gz
colobot-6a0d150539897ec65ccc161305db48de10ea35ba.tar.bz2
colobot-6a0d150539897ec65ccc161305db48de10ea35ba.zip
Interface works
- removed mock of CInterface and fixed event passing to CRobotMain - changed texture names from tga and bmp to png - UI now works but interaction is still broken
Diffstat (limited to 'src/ui/color.cpp')
-rw-r--r--src/ui/color.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/color.cpp b/src/ui/color.cpp
index 2666f84..4d071c6 100644
--- a/src/ui/color.cpp
+++ b/src/ui/color.cpp
@@ -145,7 +145,7 @@ void CColor::Draw()
DrawShadow(m_pos, m_dim);
}
- m_engine->SetTexture("button1.tga");
+ m_engine->SetTexture("button1.png");
m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
CControl::Draw();
@@ -153,7 +153,7 @@ void CColor::Draw()
// color = GetColor(m_color);
color = GetColor();
- m_engine->SetTexture("xxx.tga"); // no texture
+ m_engine->SetTexture("xxx.png"); // no texture
m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
device = m_engine->GetDevice();
@@ -187,7 +187,7 @@ void CColor::Draw()
color = GetColor();
- m_engine->SetTexture("xxx.tga"); // no texture
+ m_engine->SetTexture("xxx.png"); // no texture
m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
vertex[0] = Gfx::VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color, Gfx::Color(), Math::Point(0.0f, 0.0f));