Changeset 8202 in orxonox.OLD for branches/script_engine/src/lib/script_engine/script_trigger.h

Timestamp:

Jun 7, 2006, 4:39:04 PM (18 years ago)

Author:

snellen

Message:

renamed scriptable to scriptclass, made ScriptManager create the script triggers

File:

• branches/script_engine/src/lib/script_engine/script_trigger.h (modified) (4 diffs)

branches/script_engine/src/lib/script_engine/script_trigger.h

@@ -12 +12 @@
 {
   public:
-    ScriptTrigger();
+    ScriptTrigger(const TiXmlElement* root);
     ~ScriptTrigger();
 
@@ -21 +21 @@
     
     void setTarget(const std::string& targetName);
-    
-    void setTarget(WorldEntity* target) { if(target!=NULL) this->target=target;if(worldEntityIsParent)this->setParent(target); }
-    void setTargetName(std::string& name){ this->targetName = name; }
+    void setTarget(WorldEntity* target) { if(target!=NULL) this->target=target; }
+ 
     void setCallOnce(bool call) { this->callOnce = call;}
     void setRadius(float radius) { if(radius>0) this->radius = radius;}
@@ -30 +29 @@
     void setFunction(std::string& function){this->functionName = function;}
 
-    std::string getTargetName(){return targetName;}
+    std::string getTargetName();
 
   private:
@@ -36 +35 @@
     std::string  parentName;
     WorldEntity* target;
-    std::string  targetName;
     bool         worldEntityIsParent;
     bool         callOnce;
-    bool scriptCalled;
-    float radius;
-    float delay;
-    std::string scriptFile;
-    std::string functionName;
+    bool         scriptCalled;
+    float        radius;
+    float        delay;
+    std::string  scriptFile;
+    std::string  functionName;
 
     bool callScript;