Changeset 8243 for code/branches/portals/src/modules/portals/PortalLink.h

Timestamp:

Apr 14, 2011, 4:33:33 PM (13 years ago)

Author:

anbueche

Message:

portals work pretty good

File:

• code/branches/portals/src/modules/portals/PortalLink.h (modified) (3 diffs)

code/branches/portals/src/modules/portals/PortalLink.h

@@ -8 +8 @@
 #include "objects/eventsystem/EventListener.h"
 
-#include <set>
+#include <map>
 
 namespace orxonox
 {
-    class _PortalsExport PortalLink : public EventListener
+    class _PortalsExport PortalLink : public BaseObject
     {
         public:
@@ -36 +36 @@
                 return this->toID_;
             }
-            void use(WorldEntity * entity);
-            virtual void processEvent(Event& event);
+            static void use(MobileEntity * entity, PortalEndPoint * entrance);
         protected:
         private:
+            static std::map<PortalEndPoint *, PortalEndPoint *> links_s;
             unsigned int fromID_;
             unsigned int toID_;
@@ -45 +45 @@
             PortalEndPoint* to_;
             float activationRadius_;
-            std::set<WorldEntity *> recentlyPorted;
-            ObjectList<WorldEntity>::iterator it_;
             bool isNowPortable(WorldEntity * ent);
     };