Changeset 9667 for code/trunk/src/libraries/core/BaseObject.h

Timestamp:

Aug 25, 2013, 9:08:42 PM (12 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

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

code/trunk/src/libraries/core/BaseObject.h

@@ -49 +49 @@
 
 #include "util/mbool.h"
-#include "OrxonoxClass.h"
-#include "Super.h"
-#include "SmartPtr.h"
+#include "class/OrxonoxClass.h"
+#include "class/Super.h"
+#include "object/SmartPtr.h"
 
 namespace orxonox
@@ -60 +60 @@
 
     /// The BaseObject is the parent of all classes representing an instance in the game.
-    class _CoreExport BaseObject : virtual public OrxonoxClass
+    class _CoreExport BaseObject : public OrxonoxClass
     {
         template <class T> friend class XMLPortClassParamContainer;
 
         public:
-            BaseObject(BaseObject* creator);
+            BaseObject(Context* context);
             virtual ~BaseObject();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);