Changeset 8290

Timestamp:

Apr 21, 2011, 10:48:55 PM (14 years ago)

Author:

dafrick

Message:

Moving the things done with the eventTemplate into the PortalEndPoint class.

Location:

code/branches/portals

Files:

• data/levels/portals.oxw (modified) (2 diffs)
• src/modules/portals/PortalEndPoint.cc (modified) (3 diffs)
• src/modules/portals/PortalEndPoint.h (modified) (1 diff)

code/branches/portals/data/levels/portals.oxw

@@ -26 +26 @@
   >
 
-    <Template name=portalEventTemplate>
-        <PortalEndPoint>
-            <events>
-                <execute>
-                    <EventListener event="portal" />
-                </execute>
-            </events>
-        </PortalEndPoint>
-    </Template>
-
     <Template name=portalDefault>
         <PortalEndPoint>
@@ -45 +35 @@
 
     <PortalEndPoint position="0,0,0" id="1" distance="40" target="MobileEntity" design="portalDefault" eventTemplate="portalEventTemplate" />
-    <PortalEndPoint position="-400,0,0" id="2" distance="40" lookat="0,100,0" target="MobileEntity" design="portalDefault" eventTemplate="portalEventTemplate" />
+    <PortalEndPoint position="-400,0,0" id="2" distance="40" lookat="0,100,0" target="MobileEntity" design="portalDefault" />
     <PortalLink fromID="1" toID="2" />
     <PortalLink fromID="2" toID="1" />

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

@@ -9 +9 @@
 {
     CreateFactory(PortalEndPoint);
+    
+    /*static*/ const std::string PortalEndPoint::EVENTFUNCTIONNAME = "execute";
 
     std::map<unsigned int, PortalEndPoint *> PortalEndPoint::idMap_s;
@@ -31 +33 @@
         XMLPortParam(PortalEndPoint, "design", setTemplate, getTemplate, xmlelement, mode);
         XMLPortParamExtern(PortalEndPoint, DistanceMultiTrigger, this->trigger_, "distance", setDistance, getDistance, xmlelement, mode);
-        XMLPortParamLoadOnly(PortalEndPoint, "eventTemplate", setEventTemplate, xmlelement, mode);
         XMLPortParamLoadOnly(PortalEndPoint, "target", setTargets, xmlelement, mode).defaultValues("Pawn");
+        
+        // Add the DistanceMultiTrigger as event source.
+        this->addEventSource(this->trigger_, EVENTFUNCTIONNAME);
         
         if(mode == XMLPort::LoadObject)
@@ -44 +48 @@
         SUPER(PortalEndPoint, XMLEventPort, xmlelement, mode);
         
-        XMLPortEventSink(PortalEndPoint, BaseObject, "execute", execute, xmlelement, mode);
+        XMLPortEventSink(PortalEndPoint, BaseObject, EVENTFUNCTIONNAME, execute, xmlelement, mode);
     }
 

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

@@ -49 +49 @@
             void jumpOut(MobileEntity * entity);
         protected:
+            
         private:
+            static const std::string EVENTFUNCTIONNAME;
+            
             unsigned int id_;
             DistanceMultiTrigger * trigger_;
             std::string templateName_;
-            void setEventTemplate(const std::string & temp)
-            {
-                this->addTemplate(temp);
-            }
+
             std::set<MobileEntity *> recentlyJumpedOut_; //!< Entities which recently jumped out of this EndPoint, hence they shouldn't be pulled in again if the endpoint is the beginning of a link
     };