diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-16 10:38:08 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-16 10:38:08 +0200 |
| commit | 6a0d150539897ec65ccc161305db48de10ea35ba (patch) | |
| tree | 7064e569459bd8d704edd28552f48bf2978d61a0 /src/ui/scroll.cpp | |
| parent | af9af56bb007050c969af310c4e816d260b9ce7f (diff) | |
| download | colobot-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/scroll.cpp')
| -rw-r--r-- | src/ui/scroll.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/scroll.cpp b/src/ui/scroll.cpp index 86595f9..21f8158 100644 --- a/src/ui/scroll.cpp +++ b/src/ui/scroll.cpp @@ -379,7 +379,7 @@ void CScroll::DrawVertex(Math::Point pos, Math::Point dim, int icon) if ( icon == 0 ) { - m_engine->SetTexture("button2.tga"); + m_engine->SetTexture("button2.png"); m_engine->SetState(Gfx::ENG_RSTATE_NORMAL); uv1.x = 0.0f/256.0f; // yellow rectangle uv1.y = 32.0f/256.0f; @@ -389,7 +389,7 @@ void CScroll::DrawVertex(Math::Point pos, Math::Point dim, int icon) } else if ( icon == 1 ) { - m_engine->SetTexture("button2.tga"); + m_engine->SetTexture("button2.png"); m_engine->SetState(Gfx::ENG_RSTATE_NORMAL); uv1.x = 128.0f/256.0f; // gray rectangle uv1.y = 32.0f/256.0f; @@ -399,7 +399,7 @@ void CScroll::DrawVertex(Math::Point pos, Math::Point dim, int icon) } else if ( icon == 2 ) { - m_engine->SetTexture("button1.tga"); + m_engine->SetTexture("button1.png"); m_engine->SetState(Gfx::ENG_RSTATE_NORMAL); uv1.x = 64.0f/256.0f; // blue rectangle uv1.y = 0.0f/256.0f; @@ -409,7 +409,7 @@ void CScroll::DrawVertex(Math::Point pos, Math::Point dim, int icon) } else { - m_engine->SetTexture("button2.tga"); + m_engine->SetTexture("button2.png"); m_engine->SetState(Gfx::ENG_RSTATE_NORMAL); uv1.x = 104.0f/256.0f; // blue line - uv1.y = 32.0f/256.0f; |