Changeset 3196 for code/trunk/src/core/BaseObject.cc

Timestamp:

Jun 20, 2009, 9:20:47 AM (16 years ago)

Author:

rgrieder

Message:

Merged pch branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/BaseObject.cc (modified) (2 diffs)

code/trunk/src/core/BaseObject.cc

@@ -36 +36 @@
 #include <tinyxml/tinyxml.h>
 
+#include "util/String.h"
 #include "CoreIncludes.h"
+#include "Event.h"
 #include "EventIncludes.h"
 #include "Functor.h"
-#include "XMLPort.h"
+#include "Iterator.h"
+#include "Template.h"
 #include "XMLFile.h"
 #include "XMLNameListener.h"
-#include "Template.h"
-#include "util/String.h"
-#include "util/mbool.h"
+#include "XMLPort.h"
 
 namespace orxonox
@@ -293 +294 @@
     void BaseObject::processEvent(Event& event)
     {
-        SetEvent(BaseObject, "activity", setActive, event);
-        SetEvent(BaseObject, "visibility", setVisible, event);
+        ORXONOX_SET_EVENT(BaseObject, "activity", setActive, event);
+        ORXONOX_SET_EVENT(BaseObject, "visibility", setVisible, event);
     }