Changeset 1552 for code/trunk/src/orxonox/tools

Timestamp:

Jun 6, 2008, 5:31:58 PM (17 years ago)

Author:

landauf

Message:

several improvements:

• AI works properly now - add enemies with 'createEnemy x' where x is the number of enemies to add, default is 1. You can remove AI ships with 'killEnemies'.
• Added new explosion (with smoke)
• Added new projectile (with trail)
• Added new thruster emitter
• AI ships are destroyable - they start with 100 hp, each hit makes 15 hp damage, this value is configurable in the config-file: [Projectile] damage_
• Added AI ship spawn and explosion effects

Location:

code/trunk/src/orxonox/tools

Files:

• Timer.cc (modified) (2 diffs)
• Timer.h (modified) (3 diffs)

code/trunk/src/orxonox/tools/Timer.cc

@@ -102 +102 @@
     TimerBase::~TimerBase()
     {
-      if (this->executor_)
-          delete this->executor_;
+        this->deleteExecutor();
     }
 
@@ -112 +111 @@
     {
         (*this->executor_)();
+    }
+
+    /**
+        @brief Deletes the executor.
+    */
+    void TimerBase::deleteExecutor()
+    {
+      if (this->executor_)
+          delete this->executor_;
     }
 

code/trunk/src/orxonox/tools/Timer.h

@@ -78 +78 @@
 
             void run() const;
+            void deleteExecutor();
 
             /** @brief Starts the Timer: Function-call after 'interval' seconds. */
@@ -149 +150 @@
             void setTimer(float interval, bool bLoop, T* object, ExecutorMember<T>* executor)
             {
+                this->deleteExecutor();
+
                 this->interval_ = interval;
                 this->bLoop_ = bLoop;
@@ -185 +188 @@
             void setTimer(float interval, bool bLoop, ExecutorStatic* executor)
             {
+                this->deleteExecutor();
+
                 this->interval_ = interval;
                 this->bLoop_ = bLoop;