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/list.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/list.cpp')
| -rw-r--r-- | src/ui/list.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/list.cpp b/src/ui/list.cpp index cbf8268..80609d7 100644 --- a/src/ui/list.cpp +++ b/src/ui/list.cpp @@ -341,7 +341,7 @@ void CList::Draw() dim = m_dim; if (m_icon == 0) { - m_engine->SetTexture("button2.tga"); + m_engine->SetTexture("button2.png"); m_engine->SetState(Gfx::ENG_RSTATE_NORMAL); uv1.x = 128.0f / 256.0f; @@ -349,7 +349,7 @@ void CList::Draw() uv2.x = 160.0f / 256.0f; uv2.y = 96.0f / 256.0f; } else { - m_engine->SetTexture("button2.tga"); + m_engine->SetTexture("button2.png"); m_engine->SetState(Gfx::ENG_RSTATE_NORMAL); uv1.x = 132.0f / 256.0f; @@ -382,7 +382,7 @@ void CList::Draw() dim.y *= 0.4f; pos.y -= dim.y; - m_engine->SetTexture("button2.tga"); + m_engine->SetTexture("button2.png"); m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE); // was D3DSTATETTw uv1.x = 120.0f / 256.0f; uv1.y = 64.0f / 256.0f; @@ -448,7 +448,7 @@ void CList::Draw() dim.y -= 4.0f / 480.0f; if ( m_check[i + m_firstLine] ) { - m_engine->SetTexture("button1.tga"); + m_engine->SetTexture("button1.png"); m_engine->SetState(Gfx::ENG_RSTATE_NORMAL); uv1.x = 64.0f / 256.0f; uv1.y = 0.0f / 256.0f; @@ -471,7 +471,7 @@ void CList::Draw() uv2.y -= dp; DrawIcon(pos, dim, uv1, uv2); // draws v } else { - m_engine->SetTexture("button1.tga"); + m_engine->SetTexture("button1.png"); m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE); // was D3DSTATETTw if ( i + m_firstLine == m_selectLine ) { uv1.x =224.0f / 256.0f; // < |