Merge remote-tracking branch 'origin/dev' into dev-graphics

2012-09-30 17:10:40 +02:00 · 2012-09-30 17:10:40 +02:00 · ba3dce3aed
parent 8f99efd861 ac1472621a
commit ba3dce3aed
1 changed files with 1 additions and 0 deletions
--- 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;