Changeset 8239 in orxonox.OLD for branches/script_engine/src/lib/script_engine/script_trigger.cc
- Timestamp:
- Jun 8, 2006, 1:53:06 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/script_engine/src/lib/script_engine/script_trigger.cc
r8214 r8239 3 3 #include "script.h" 4 4 5 #include "state.h" 5 6 6 7 ScriptTrigger::ScriptTrigger(const TiXmlElement* root) … … 112 113 void ScriptTrigger::setScript(const std::string& file) 113 114 { 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 } 119 122 }
Note: See TracChangeset
for help on using the changeset viewer.