Changeset 1052 for code/trunk/src/orxonox/core/BaseObject.cc

Timestamp:

Apr 14, 2008, 3:42:49 AM (17 years ago)

Author:

landauf

Message:

merged core2 back to trunk
there might be some errors, wasn't able to test it yet due to some strange g++ and linker behaviour.

File:

• code/trunk/src/orxonox/core/BaseObject.cc (modified) (2 diffs)

code/trunk/src/orxonox/core/BaseObject.cc

@@ -52 +52 @@
         this->bVisible_ = true;
         this->level_ = 0;
+        this->namespace_ = 0;
     }
 
@@ -78 +79 @@
         @return The XML-element
     */
-    void BaseObject::XMLPort(Element& xmlelement, bool loading)
+    void BaseObject::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        XMLPortParam(BaseObject, "name", setName, getName, xmlelement, loading);
+        XMLPortParam(BaseObject, "name", setName, getName, xmlelement, mode);
     }