diff options
| author | krzys-h <krzys_h@interia.pl> | 2013-03-27 19:55:27 +0100 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2013-03-27 19:55:27 +0100 |
| commit | 8f379e5cf12a35ca9a32f34f85f42765c53cba47 (patch) | |
| tree | f72c7d7f5c100d917da1b72321a410b5b3f4abc9 /src/object/brain.cpp | |
| parent | 0691460682a953770d54b9e6ceda4f18b92a510d (diff) | |
| download | colobot-8f379e5cf12a35ca9a32f34f85f42765c53cba47.tar.gz colobot-8f379e5cf12a35ca9a32f34f85f42765c53cba47.tar.bz2 colobot-8f379e5cf12a35ca9a32f34f85f42765c53cba47.zip | |
Changes to Scribbler interface
Diffstat (limited to 'src/object/brain.cpp')
| -rw-r--r-- | src/object/brain.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/object/brain.cpp b/src/object/brain.cpp index 52db776..fa3e425 100644 --- a/src/object/brain.cpp +++ b/src/object/brain.cpp @@ -1944,9 +1944,7 @@ bool CBrain::CreateInterface(bool bSelect) void CBrain::UpdateInterface(float rTime) { Ui::CWindow* pw; -/* TODO: #if _TEEN Ui::CButton* pb; -#endif*/ Ui::CGauge* pg; Ui::CCompass* pc; Ui::CGroup* pgr; @@ -2058,8 +2056,7 @@ void CBrain::UpdateInterface(float rTime) pc->SetState(Ui::STATE_VISIBLE, m_main->GetShowMap()); } -#if _TEEN - pb = (CButton*)pw->SearchControl(EVENT_OBJECT_REC); + pb = (Ui::CButton*)pw->SearchControl(EVENT_OBJECT_REC); if ( pb != 0 ) { if ( m_bTraceRecord && Math::Mod(m_time, 0.4f) >= 0.2f ) @@ -2071,7 +2068,6 @@ void CBrain::UpdateInterface(float rTime) pb->ClearState(Ui::STATE_CHECK); } } -#endif bOnBoard = m_camera->GetType() == Gfx::CAM_TYPE_ONBOARD; @@ -2151,10 +2147,8 @@ void CBrain::UpdateInterface() Ui::CWindow* pw; Ui::CButton* pb; Ui::CSlider* ps; -#if _TEEN - CColor* pc; + Ui::CColor* pc; int color; -#endif bool bEnable, bFly, bRun; char title[100]; @@ -2189,7 +2183,6 @@ void CBrain::UpdateInterface() EnableInterface(pw, EVENT_OBJECT_FIRE, bEnable); EnableInterface(pw, EVENT_OBJECT_SPIDEREXPLO, bEnable); EnableInterface(pw, EVENT_OBJECT_RESET, bEnable); -#if _TEEN EnableInterface(pw, EVENT_OBJECT_PEN0, bEnable); EnableInterface(pw, EVENT_OBJECT_PEN1, bEnable); EnableInterface(pw, EVENT_OBJECT_PEN2, bEnable); @@ -2201,7 +2194,6 @@ void CBrain::UpdateInterface() EnableInterface(pw, EVENT_OBJECT_PEN8, bEnable); EnableInterface(pw, EVENT_OBJECT_REC, bEnable); EnableInterface(pw, EVENT_OBJECT_STOP, bEnable); -#endif if ( type == OBJECT_HUMAN ) // builder? { @@ -2352,7 +2344,6 @@ void CBrain::UpdateInterface() CheckInterface(pw, EVENT_OBJECT_MFRONT, m_manipStyle==EVENT_OBJECT_MFRONT); } -#if _TEEN if ( m_object->GetTraceDown() ) { pb = static_cast< Ui::CButton* >(pw->SearchControl(EVENT_OBJECT_PEN0)); @@ -2452,7 +2443,6 @@ void CBrain::UpdateInterface() pc->ClearState(Ui::STATE_CHECK); } } -#endif } // Updates the list of programs. |