diff options
| author | erihel <erihel@gmail.com> | 2013-06-24 22:09:39 +0200 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2013-06-24 22:09:39 +0200 |
| commit | 41fa8458c2e28f05a610bfc3119f86b8dc85542a (patch) | |
| tree | 4a653c3f32cb0d524af2669d666fd8385b9a408f /src/script | |
| parent | 5c15855009aaab519718b80808d9e10eeda6b425 (diff) | |
| download | colobot-41fa8458c2e28f05a610bfc3119f86b8dc85542a.tar.gz colobot-41fa8458c2e28f05a610bfc3119f86b8dc85542a.tar.bz2 colobot-41fa8458c2e28f05a610bfc3119f86b8dc85542a.zip | |
Some Ui refactoring
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/script.cpp | 9 | ||||
| -rw-r--r-- | src/script/script.h | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/script/script.cpp b/src/script/script.cpp index b03702c..8736f01 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -3174,7 +3174,7 @@ bool CScript::rMessage(CBotVar* var, CBotVar* result, int& exception, void* user type = static_cast<Ui::TextType>(var->GetValInt()); } - script->m_displayText->DisplayText(p, script->m_object, 10.0f, type); + script->m_main->GetDisplayText()->DisplayText(p, script->m_object, 10.0f, type); script->m_main->CheckEndMessage(p); return true; @@ -3504,7 +3504,6 @@ CScript::CScript(CObject* object, CTaskManager** secondaryTask) m_secondaryTask = secondaryTask; m_interface = m_main->GetInterface(); - m_displayText = m_main->GetDisplayText(); m_ipf = CBOT_IPF; m_errMode = ERM_STOP; @@ -3899,7 +3898,7 @@ bool CScript::Continue(const Event &event) { char s[100]; GetError(s); - m_displayText->DisplayText(s, m_object, 10.0f, Ui::TT_ERROR); + m_main->GetDisplayText()->DisplayText(s, m_object, 10.0f, Ui::TT_ERROR); } m_engine->SetPause(true); // gives pause return true; @@ -3932,7 +3931,7 @@ bool CScript::Continue(const Event &event) { char s[100]; GetError(s); - m_displayText->DisplayText(s, m_object, 10.0f, Ui::TT_ERROR); + m_main->GetDisplayText()->DisplayText(s, m_object, 10.0f, Ui::TT_ERROR); } return true; } @@ -3974,7 +3973,7 @@ bool CScript::Step(const Event &event) { char s[100]; GetError(s); - m_displayText->DisplayText(s, m_object, 10.0f, Ui::TT_ERROR); + m_main->GetDisplayText()->DisplayText(s, m_object, 10.0f, Ui::TT_ERROR); } return true; } diff --git a/src/script/script.h b/src/script/script.h index 7a5d075..7fd5555 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -34,7 +34,6 @@ class CTaskManager; class CRobotMain; namespace Ui{ -class CDisplayText; class CEdit; class CInterface; class CList; @@ -210,7 +209,6 @@ private: protected: Gfx::CEngine* m_engine; Ui::CInterface* m_interface; - Ui::CDisplayText* m_displayText; CBotProgram* m_botProg; CRobotMain* m_main; Gfx::CTerrain* m_terrain; |