Changeset 8212 in orxonox.OLD for branches/script_engine/src

Timestamp:

Jun 7, 2006, 8:51:05 PM (18 years ago)

Author:

snellen

Message:

corrected mistakes

Location:

branches/script_engine/src/lib/script_engine

Files:

• script_manager.cc (modified) (1 diff)
• script_manager.h (modified) (2 diffs)
• script_trigger.cc (modified) (3 diffs)

branches/script_engine/src/lib/script_engine/script_manager.cc

@@ -95 +95 @@
 
 
-Script* ScriptManager::getScriptByFile(std::string& file)
+Script* ScriptManager::getScriptByFile(const std::string& file)
 {
   if(getScripts())

branches/script_engine/src/lib/script_engine/script_manager.h

@@ -21 +21 @@
   /// LOADING
   virtual void loadParams(const TiXmlElement* root);
- 
+
   /// QUERRYING
-  Script* getScriptByFile(std::string& file);
-  
+  Script* getScriptByFile(const std::string& file);
 
-  
+
+
  private:
 
@@ -33 +33 @@
    void  createScripts(const TiXmlElement* scripts);
    void  createTriggers(const TiXmlElement* triggers);
-   
+
    bool getTriggers();
    bool getScripts();

branches/script_engine/src/lib/script_engine/script_trigger.cc

@@ -22 +22 @@
   if(root != NULL)
   {
-  WorldEntity ::loadParams(root);
+    WorldEntity ::loadParams(root);
 
-   { LoadParam(root, "file", this, ScriptTrigger, setScript)
+    LoadParam(root, "file", this, ScriptTrigger, setScript)
         .describe("the fileName of the script, that should be triggered by this script trigger")
         .defaultValues("");
@@ -46 +46 @@
         .defaultValues("");
 
-    }
-    timer = delay;
+
   }
 
@@ -107 +106 @@
      {
      if(!(script->selectFunction(this->functionName,0)) )
-       printf("Error ScriptTrigger: Selection of %s in %s failed.\n",functionName.c_str(), scriptFile.c_str());
+       printf("Error ScriptTrigger: Selection of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
      if( !(script->executeFunction()) )
-       printf("Error ScriptTrigger: Execution of %s in %s failed.\n",functionName.c_str(),scriptFile.c_str());
+       printf("Error ScriptTrigger: Execution of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
      }
 }