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/edit.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/edit.cpp')
-rw-r--r-- | src/ui/edit.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp index fb2fcb4..f9b7837 100644 --- a/src/ui/edit.cpp +++ b/src/ui/edit.cpp @@ -1225,11 +1225,7 @@ void CEdit::DrawPart(Math::Point pos, Math::Point dim, int icon) Math::Point uv1, uv2; float dp; -#if _POLISH - m_engine->SetTexture("interface/textp.png"); -#else m_engine->SetTexture("interface/text.png"); -#endif m_engine->SetState(Gfx::ENG_RSTATE_NORMAL); uv1.x = (16.0f/256.0f)*(icon%16); |