Changeset 9589 for code/branches/core6/src/orxonox

Timestamp:

Mar 26, 2013, 11:43:43 PM (12 years ago)

Author:

landauf

Message:

interfaces which are part of the framework and only rely on the object list for calling all instances may inherit from Listable

Location:

code/branches/core6/src/orxonox

Files:

• chat/ChatListener.h (modified) (2 diffs)
• graphics/ParticleEmitter.cc (modified) (2 diffs)
• overlays/InGameConsole.cc (modified) (1 diff)
• worldentities/BigExplosion.cc (modified) (4 diffs)
• worldentities/ExplosionChunk.cc (modified) (1 diff)
• worldentities/pawns/SpaceShip.cc (modified) (2 diffs)

code/branches/core6/src/orxonox/chat/ChatListener.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "core/class/OrxonoxClass.h"
+#include "core/object/Listable.h"
 
 namespace orxonox
@@ -40 +40 @@
         message was sent through ChatManager.
     */
-    class _OrxonoxExport ChatListener : virtual public OrxonoxClass
+    class _OrxonoxExport ChatListener : virtual public Listable
     {
         friend class ChatManager;

code/branches/core6/src/orxonox/graphics/ParticleEmitter.cc

@@ -63 +63 @@
         {
             this->detachOgreObject(this->particles_->getParticleSystem());
-            this->particles_->destroy();
+            delete this->particles_;
         }
     }
@@ -101 +101 @@
         if (this->particles_)
         {
-            this->particles_->destroy();
+            delete this->particles_;
             this->particles_ = 0;
         }

code/branches/core6/src/orxonox/overlays/InGameConsole.cc

@@ -110 +110 @@
 
         // destroy the underlaying shell
-        this->shell_->destroy();
+        delete this->shell_;
 
         Ogre::OverlayManager* ovMan = Ogre::OverlayManager::getSingletonPtr();

code/branches/core6/src/orxonox/worldentities/BigExplosion.cc

@@ -225 +225 @@
             {
                 this->debris1_->detachOgreObject(this->debrisFire1_->getParticleSystem());
-                this->debrisFire1_->destroy();
+                delete this->debrisFire1_;
             }
             if (this->debrisSmoke1_)
             {
                 this->debris1_->detachOgreObject(this->debrisSmoke1_->getParticleSystem());
-                this->debrisSmoke1_->destroy();
+                delete this->debrisSmoke1_;
             }
 
@@ -236 +236 @@
             {
                 this->debris2_->detachOgreObject(this->debrisFire2_->getParticleSystem());
-                this->debrisFire2_->destroy();
+                delete this->debrisFire2_;
             }
             if (this->debrisSmoke2_)
             {
                 this->debris2_->detachOgreObject(this->debrisSmoke2_->getParticleSystem());
-                this->debrisSmoke2_->destroy();
+                delete this->debrisSmoke2_;
             }
 
@@ -247 +247 @@
             {
                 this->debris3_->detachOgreObject(this->debrisFire3_->getParticleSystem());
-                this->debrisFire3_->destroy();
+                delete this->debrisFire3_;
             }
             if (this->debrisSmoke3_)
             {
                 this->debris3_->detachOgreObject(this->debrisSmoke3_->getParticleSystem());
-                this->debrisSmoke3_->destroy();
+                delete this->debrisSmoke3_;
             }
 
@@ -258 +258 @@
             {
                 this->debris4_->detachOgreObject(this->debrisFire4_->getParticleSystem());
-                this->debrisFire4_->destroy();
+                delete this->debrisFire4_;
             }
             if (this->debrisSmoke4_)
             {
                 this->debris4_->detachOgreObject(this->debrisSmoke4_->getParticleSystem());
-                this->debrisSmoke4_->destroy();
+                delete this->debrisSmoke4_;
             }
         }

code/branches/core6/src/orxonox/worldentities/ExplosionChunk.cc

@@ -92 +92 @@
             {
                 this->detachOgreObject(this->fire_->getParticleSystem());
-                this->fire_->destroy();
+                delete this->fire_;
             }
             if (this->smoke_)
             {
                 this->detachOgreObject(this->smoke_->getParticleSystem());
-                this->smoke_->destroy();
+                delete this->smoke_;
             }
         }

code/branches/core6/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -96 +96 @@
 
             if (this->boostBlur_)
-                this->boostBlur_->destroy();
+                delete this->boostBlur_;
         }
     }
@@ -447 +447 @@
         if (!this->bEnableMotionBlur_ && this->boostBlur_ != NULL)
         {
-            this->boostBlur_->destroy();
+            delete this->boostBlur_;
             this->boostBlur_ = NULL;
         }