Changeset 5935 for code/branches/pickup/src/modules/objects/triggers

Timestamp:

Oct 13, 2009, 5:05:17 PM (15 years ago)

Author:

dafrick

Message:

Hopefully merged trunk successfully into pickup branch.

Location:

code/branches/pickup

Files:

• . (modified) (1 prop)
• src/modules/objects/triggers/CheckPoint.cc (modified) (1 diff)
• src/modules/objects/triggers/EventTrigger.cc (modified) (1 diff)
• src/modules/objects/triggers/EventTrigger.h (modified) (1 diff)
• src/modules/objects/triggers/Trigger.cc (modified) (1 diff)

code/branches/pickup/src/modules/objects/triggers/CheckPoint.cc

@@ -85 +85 @@
         DistanceTrigger::triggered(bIsTriggered);
 
-        Asteroids* gametype = orxonox_cast<Asteroids*>(this->getGametype());
+        Asteroids* gametype = orxonox_cast<Asteroids*>(this->getGametype().get());
         if (gametype)
         {

code/branches/pickup/src/modules/objects/triggers/EventTrigger.cc

@@ -47 +47 @@
     }
 
-    void EventTrigger::processEvent(Event& event)
+    void EventTrigger::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        SUPER(EventTrigger, processEvent, event);
+        SUPER(EventTrigger, XMLEventPort, xmlelement, mode);
 
-        ORXONOX_SET_EVENT(EventTrigger, "trigger", trigger, event);
+        XMLPortEventState(EventTrigger, BaseObject, "trigger", trigger, xmlelement, mode);
     }
 

code/branches/pickup/src/modules/objects/triggers/EventTrigger.h

@@ -41 +41 @@
             virtual ~EventTrigger();
 
-            virtual void processEvent(Event& event);
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
 
             inline void trigger(bool bTriggered)

code/branches/pickup/src/modules/objects/triggers/Trigger.cc

@@ -72 +72 @@
     }
 
-    this->setObjectMode(0x0);
+    this->setSyncMode(0x0);
   }