diff options
| author | adiblol <adiblol@hydrogen> | 2012-09-30 17:10:40 +0200 |
|---|---|---|
| committer | adiblol <adiblol@hydrogen> | 2012-09-30 17:10:40 +0200 |
| commit | ba3dce3aed8ade76901dc0cbf228b5cb81d8c2a5 (patch) | |
| tree | 55364a73c2c78b782cbcfc9ccf7435ba3c1585d7 | |
| parent | 8f99efd861d889c720782569a975fd6df6f5fa94 (diff) | |
| parent | ac1472621a101205babd33020e5530fa32580eff (diff) | |
| download | colobot-ba3dce3aed8ade76901dc0cbf228b5cb81d8c2a5.tar.gz colobot-ba3dce3aed8ade76901dc0cbf228b5cb81d8c2a5.tar.bz2 colobot-ba3dce3aed8ade76901dc0cbf228b5cb81d8c2a5.zip | |
Merge remote-tracking branch 'origin/dev' into dev-graphics
| -rw-r--r-- | src/script/script.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script/script.cpp b/src/script/script.cpp index f23c11d..2d76ad3 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -2669,6 +2669,7 @@ CScript::CScript(CInstanceManager* iMan, CObject* object, CTaskManager** seconda m_secondaryTask = secondaryTask; m_interface = static_cast<Ui::CInterface*>(m_iMan->SearchInstance(CLASS_INTERFACE)); + m_displayText = static_cast<Ui::CDisplayText*>(m_iMan->SearchInstance(CLASS_DISPLAYTEXT)); m_ipf = CBOT_IPF; m_errMode = ERM_STOP; |