Changeset 10897

Timestamp:

Nov 30, 2015, 3:56:38 PM (8 years ago)

Author:

landauf

Message:

register event-source

Location:

code/branches/particleEffectsHS15/src/modules/weapons/projectiles

Files:

• MineProjectile.cc (modified) (3 diffs)
• MineProjectile.h (modified) (1 diff)

code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
+#include "core/command/Executor.h"
+#include "core/EventIncludes.h"
 #include "graphics/Model.h"
-#include "core/command/Executor.h"
 
 namespace orxonox
@@ -95 +96 @@
             distanceTrigger_->addTarget("Pawn");
             distanceTrigger_->setStayActive(true);
+
+            this->addEventSource(distanceTrigger_, "explode");
         }
     }
@@ -100 +103 @@
     MineProjectile::~MineProjectile()
     {
-        /*if (modelCore_ != NULL)
+        if (this->isInitialized())
         {
-            modelCore_->destroy();
-        }*/
-        /*if (distanceTrigger_ != NULL)
-        {
-            distanceTrigger_->destroy();
-        }*/
+            /*if (modelCore_ != NULL)
+            {
+                modelCore_->destroy();
+            }*/
+            if (distanceTrigger_)
+                distanceTrigger_->destroy();
+        }
+    }
+
+    void MineProjectile::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(MineProjectile, XMLEventPort, xmlelement, mode);
+        XMLPortEventState(MineProjectile, BaseObject, "explode", Explode, xmlelement, mode);
     }
 

code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.h

@@ -56 +56 @@
             virtual ~MineProjectile();
 
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+
             virtual void setMaxTimeUntilExplosion(float maxTimeUntilExplosion);
             virtual void setTimeUntilActivation(float timeUntilActivation);