[Orxonox-commit 6240] r10897 - code/branches/particleEffectsHS15/src/modules/weapons/projectiles

[landauf at orxonox.net]

Author: landauf
Date: 2015-11-30 15:56:38 +0100 (Mon, 30 Nov 2015)
New Revision: 10897

Modified:
   code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc
   code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.h
Log:
register event-source

Modified: code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc
===================================================================
--- code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc	2015-11-30 14:56:04 UTC (rev 10896)
+++ code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc	2015-11-30 14:56:38 UTC (rev 10897)
@@ -34,8 +34,9 @@
 #include "MineProjectile.h"
 
 #include "core/CoreIncludes.h"
+#include "core/command/Executor.h"
+#include "core/EventIncludes.h"
 #include "graphics/Model.h"
-#include "core/command/Executor.h"
 
 namespace orxonox
 {
@@ -94,21 +95,30 @@
             distanceTrigger_->setDistance(40.0f);
             distanceTrigger_->addTarget("Pawn");
             distanceTrigger_->setStayActive(true);
+
+            this->addEventSource(distanceTrigger_, "explode");
         }
     }
 
     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);
+    }
+
     /**
     @brief
         TODO

Modified: code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.h
===================================================================
--- code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.h	2015-11-30 14:56:04 UTC (rev 10896)
+++ code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.h	2015-11-30 14:56:38 UTC (rev 10897)
@@ -55,6 +55,8 @@
             MineProjectile(Context* context);
             virtual ~MineProjectile();
 
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+
             virtual void setMaxTimeUntilExplosion(float maxTimeUntilExplosion);
             virtual void setTimeUntilActivation(float timeUntilActivation);