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/displayinfo.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/displayinfo.cpp')
| -rw-r--r-- | src/ui/displayinfo.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp index ee29e27..9204473 100644 --- a/src/ui/displayinfo.cpp +++ b/src/ui/displayinfo.cpp @@ -388,13 +388,7 @@ void CDisplayInfo::StartDisplayInfo(std::string filename, int index, bool bSoluc button = pw->CreateButton(pos, dim, 128+57, EVENT_SATCOM_HUSTON); button->SetState(STATE_SHADOW); -#if _TEEN -#if !_ENGLISH - button = pw->CreateButton(pos, dim, 46, EVENT_SATCOM_SAT); -#endif -#else button = pw->CreateButton(pos, dim, 128+58, EVENT_SATCOM_SAT); -#endif button->SetState(STATE_SHADOW); //? button = pw->CreateButton(pos, dim, 128+59, EVENT_SATCOM_OBJECT); //? button->SetState(STATE_SHADOW); |