Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 8, 2006, 1:53:06 PM (18 years ago)
Author:
bensch
Message:

more integration into orxonox framework

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/script_engine/src/lib/script_engine/script_trigger.cc

    r8214 r8239  
    33#include "script.h"
    44
     5#include "state.h"
    56
    67ScriptTrigger::ScriptTrigger(const TiXmlElement* root)
     
    112113void ScriptTrigger::setScript(const std::string& file)
    113114{
    114   ScriptManager* scriptManager = ScriptManager::getInstance();
    115   script = scriptManager->getScriptByFile(file);
    116   if(script != NULL)
    117     scriptIsOk = true;
    118 
     115  ScriptManager* scriptManager = State::getScriptManager();
     116  if (scriptManager != NULL)
     117  {
     118    script = scriptManager->getScriptByFile(file);
     119    if(script != NULL)
     120      scriptIsOk = true;
     121  }
    119122}
Note: See TracChangeset for help on using the changeset viewer.