diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-07-11 15:24:44 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-07-11 15:24:44 +0200 |
| commit | 96d49d84aafecd78c902681f20de6207badf7e85 (patch) | |
| tree | 7a835fce4f264c6c0886441c4f79e02cdf47582c /src/ui/control.cpp | |
| parent | 5223ef1fb116780298495a4d2f63e6c2c39fdfbd (diff) | |
| parent | 852223262055440569ecca70f1b9da46089424c4 (diff) | |
| download | colobot-96d49d84aafecd78c902681f20de6207badf7e85.tar.gz colobot-96d49d84aafecd78c902681f20de6207badf7e85.tar.bz2 colobot-96d49d84aafecd78c902681f20de6207badf7e85.zip | |
Merge branch 'dev' into dev-physfs
Conflicts:
data
src/app/gamedata.cpp
src/ui/control.cpp
src/ui/edit.cpp
src/ui/maindialog.cpp
Diffstat (limited to 'src/ui/control.cpp')
| -rw-r--r-- | src/ui/control.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/ui/control.cpp b/src/ui/control.cpp index 1eff38c..6686c55 100644 --- a/src/ui/control.cpp +++ b/src/ui/control.cpp @@ -506,11 +506,7 @@ void CControl::Draw() if ( icon >= 192 ) { icon -= 192; -#if _POLISH - m_engine->SetTexture("interface/textp.png"); -#else m_engine->SetTexture("interface/text.png"); -#endif m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE); } else if ( icon >= 128 ) |