Changeset 6501 for code/trunk/src/orxonox/worldentities/WorldEntity.h

Timestamp:

Mar 11, 2010, 11:32:01 AM (14 years ago)

Author:

rgrieder

Message:

Ensured OGRE v1.7 "Cthugha" code compatibility. Does not yet seem to run run though.

File:

• code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) (2 diffs)

code/trunk/src/orxonox/worldentities/WorldEntity.h

@@ -33 +33 @@
 #include "OrxonoxPrereqs.h"
 
-#include <OgreUserDefinedObject.h>
 #ifdef ORXONOX_RELEASE
 #  include <OgreSceneNode.h>
@@ -70 +69 @@
         Collision shapes: These are controlled by the internal WorldEntityCollisionShape. @see WorldEntityCollisionShape.
     */
-    class _OrxonoxExport WorldEntity : public BaseObject, public Synchronisable, public btMotionState, public Ogre::UserDefinedObject
+    class _OrxonoxExport WorldEntity : public BaseObject, public Synchronisable, public btMotionState
     {
         friend class Scene;