Changeset 5929 for code/trunk/src/modules/objects/triggers

Timestamp:

Oct 12, 2009, 8:20:07 PM (15 years ago)

Author:

rgrieder

Message:

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder

Location:

code/trunk

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/trunk/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/trunk/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/trunk/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/trunk/src/modules/objects/triggers/Trigger.cc

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