diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-10-19 16:18:36 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-10-19 16:18:36 +0200 |
| commit | 0245fdc6c328edf65b4fd9f45be4f440ef92b6eb (patch) | |
| tree | d8237bdeacdee273c2eabaefc14f21637c1f489a /src/ui/shortcut.cpp | |
| parent | d7ef0a1a5f7cee44eb8faaafefb7bb78e69be1f6 (diff) | |
| parent | 83abb8ca8e74176d64944e9681d74aa11ef6cdf9 (diff) | |
| download | colobot-0245fdc6c328edf65b4fd9f45be4f440ef92b6eb.tar.gz colobot-0245fdc6c328edf65b4fd9f45be4f440ef92b6eb.tar.bz2 colobot-0245fdc6c328edf65b4fd9f45be4f440ef92b6eb.zip | |
Merge branch 'dev-physfs' into dev
Conflicts:
src/app/app.cpp
Diffstat (limited to 'src/ui/shortcut.cpp')
| -rw-r--r-- | src/ui/shortcut.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/shortcut.cpp b/src/ui/shortcut.cpp index 5164a10..81495a7 100644 --- a/src/ui/shortcut.cpp +++ b/src/ui/shortcut.cpp @@ -116,7 +116,7 @@ void CShortcut::Draw() zoom = 1.0f; } - m_engine->SetTexture("button3.png"); + m_engine->SetTexture("textures/interface/button3.png"); if ( icon != -1 ) { @@ -132,7 +132,7 @@ void CShortcut::Draw() Math::Point p1, p2, c, uv1, uv2; float dp; - m_engine->SetTexture("button2.png"); + m_engine->SetTexture("textures/interface/button2.png"); m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE); zoom = 0.9f+sinf(m_time*8.0f)*0.1f; @@ -172,7 +172,7 @@ void CShortcut::Draw() Math::Point uv1, uv2; float dp; - m_engine->SetTexture("button3.png"); + m_engine->SetTexture("textures/interface/button3.png"); m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE); uv1.x = 160.0f/256.0f; |