summaryrefslogtreecommitdiffstats
path: root/src/ui/button.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/button.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/button.cpp')
-rw-r--r--src/ui/button.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/button.cpp b/src/ui/button.cpp
index d6a5c40..7473409 100644
--- a/src/ui/button.cpp
+++ b/src/ui/button.cpp
@@ -101,7 +101,7 @@ bool CButton::EventProcess(const Event &event)
}
if ( event.type == EVENT_MOUSE_BUTTON_DOWN &&
- event.mouseButton.button == 1 &&
+ event.mouseButton.button == 1 &&
(m_state & STATE_VISIBLE) &&
(m_state & STATE_ENABLE) )
{
@@ -125,8 +125,8 @@ bool CButton::EventProcess(const Event &event)
}
if ( event.type == EVENT_MOUSE_BUTTON_UP && //left
- event.mouseButton.button == 1 &&
- m_bCapture )
+ event.mouseButton.button == 1 &&
+ m_bCapture )
{
if ( CControl::Detect(event.pos) )
{
@@ -182,7 +182,7 @@ void CButton::Draw()
(m_state & STATE_CARD ) == 0 &&
(m_state & STATE_SIMPLY) == 0 )
{
- m_engine->SetTexture("button2.tga");
+ m_engine->SetTexture("button2.png");
m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
dp = 0.5f / 256.0f;