Changeset 5887 for code/branches/core5/src/modules/objects/eventsystem

Timestamp:

Oct 6, 2009, 4:51:08 AM (15 years ago)

Author:

landauf

Message:

Fixed an issue with the new event-system: even states which weren't declared are not loaded. While this is normally fine, it is a problem in EventDispatcher and EventTarget which have to pipe events to other objects and therefore have to support any state, not just the native ones.

Location:

code/branches/core5/src/modules/objects/eventsystem

Files:

• EventDispatcher.cc (modified) (1 diff)
• EventTarget.cc (modified) (2 diffs)
• EventTarget.h (modified) (1 diff)

code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.cc

@@ -54 +54 @@
 
         XMLPortObject(EventDispatcher, BaseObject, "targets", addTarget, getTarget, xmlelement, mode);
+
+        // since we need event sources mapped to any state, we have to parse XML by ourselves
+        this->loadAllEventStates(xmlelement, mode, this, Class(EventDispatcher));
     }
 

code/branches/core5/src/modules/objects/eventsystem/EventTarget.cc

@@ -29 +29 @@
 #include "EventTarget.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -43 +44 @@
     }
     
+    void EventTarget::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(EventTarget, XMLPort, xmlelement, mode);
+
+        // since we need event sources mapped to any state, we have to parse XML by ourselves
+        this->loadAllEventStates(xmlelement, mode, this, Class(EventTarget));
+    }
+
     void EventTarget::processEvent(Event& event)
     {

code/branches/core5/src/modules/objects/eventsystem/EventTarget.h

@@ -43 +43 @@
             virtual ~EventTarget();
             
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            
             virtual void processEvent(Event& event);