Changeset 8600

Timestamp:

May 26, 2011, 3:56:04 PM (13 years ago)

Author:

dafrick

Message:

Some cleanup.

Location:

code/branches/portals2/src/modules/portals

Files:

• PortalEndPoint.cc (modified) (4 diffs)
• PortalLink.cc (modified) (1 diff)

code/branches/portals2/src/modules/portals/PortalEndPoint.cc

@@ -32 +32 @@
 #include "portals/PortalLink.h"
 #include "worldentities/MobileEntity.h"
-
+#include <ctime>
 
 namespace orxonox
@@ -42 +42 @@
     std::map<unsigned int, PortalEndPoint *> PortalEndPoint::idMap_s;
 
-    PortalEndPoint::PortalEndPoint(BaseObject* creator) : StaticEntity(creator), id_(0), trigger_(new DistanceMultiTrigger(this)), reenterDelay_(0)
+    PortalEndPoint::PortalEndPoint(BaseObject* creator) : StaticEntity(creator), id_(0), trigger_(NULL), reenterDelay_(0)
     {
         RegisterObject(PortalEndPoint);
+        
+        this->trigger_ = new DistanceMultiTrigger(this);
         this->trigger_->setName("portal");
         this->attach(trigger_);
@@ -51 +53 @@
     PortalEndPoint::~PortalEndPoint()
     {
-    
+        if(this->isInitialized() && this->trigger_ != NULL)
+            delete this->trigger_;
     }
 
@@ -134 +137 @@
         this->recentlyJumpedOut_.insert(entity);
 
-                // adjust
+        // adjust
         entity->setPosition(this->getWorldPosition());
         entity->rotate(this->getWorldOrientation());

code/branches/portals2/src/modules/portals/PortalLink.cc

@@ -45 +45 @@
     PortalLink::~PortalLink()
     {
+        
     }