Changeset 10609 in orxonox.OLD for branches/scriptimprovements/src/world_entities/script_triggers/script_trigger.h

Timestamp:

Mar 29, 2007, 6:08:23 PM (18 years ago)

Author:

snellen

Message:

added tick trigger which always calles the script

File:

• branches/scriptimprovements/src/world_entities/script_triggers/script_trigger.h (modified) (4 diffs)

branches/scriptimprovements/src/world_entities/script_triggers/script_trigger.h

@@ -33 +33 @@
 
     /// SET MEMBER
- 
-    void setActiveOnCreation(const bool avtive) { this->activeOnCreation = avtive; }
-    void setDelay(float delay) { this->delay = delay; };
     void setScript(const std::string& file);
     void setFunction(const std::string& function){ this->functionName = function;}
@@ -41 +38 @@
     void setAddToScript(const bool add) { this->addToScript = add; }
     void setTriggerParent(const std::string& name);
-    
-    inline void setScriptIsOk(bool ok){ scriptIsOk = ok ; }
-    inline void setScriptCalled(bool called){ scriptCalled = called; }
-    inline void setScriptFinished(bool finished){ scriptFinished = finished; }
-    
-    ///POLLING
-
-    inline bool getScriptIsOk(){ return scriptIsOk; }
-    inline bool getScriptCalled(){ return scriptCalled; }
-    inline bool getScriptFinished(){ return scriptFinished; }
     
     
@@ -58 +45 @@
   private:
 
-    bool         activeOnCreation;
-    float        delay;
     Script*      script;
     std::string  functionName;
@@ -66 +51 @@
     
     //for internal use
+    bool         executionStopped;   // true when something goes wrong and the trigger has to be stopped
+    int          returnCount;        //TODO: set return count correctly
+    
+  protected:
+    
     bool         scriptCalled;
     bool         scriptIsOk;
-    bool         executionStopped;   // true when something goes wrong and the trigger has to be stopped
     bool         scriptFinished;
-    int          returnCount;        //TODO: set return count correctly
 
 };