Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/worldentities/WorldEntity.h

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/WorldEntity.h (modified) (5 diffs)

code/branches/questsystem5/src/orxonox/objects/worldentities/WorldEntity.h

@@ -33 +33 @@
 #include "OrxonoxPrereqs.h"
 
-#ifdef NDEBUG
+#ifdef _NDEBUG
 #include <OgreSceneNode.h>
 #else
@@ -176 +176 @@
 
         protected:
-            virtual void parentChanged() {}
-
             Ogre::SceneNode* node_;
 
@@ -193 +191 @@
 
             // network callbacks
-            void networkcallback_parentChanged();
+            void parentChanged();
             inline void scaleChanged()
                 { this->setScale3D(this->getScale3D()); }
@@ -271 +269 @@
             @brief
                 Sets how much reaction is applied in a collision.
-
+                
                 Consider two equal spheres colliding with equal velocities:
                 Restitution 1 means that both spheres simply reverse their velocity (no loss of energy)
@@ -421 +419 @@
 
     // Inline heavily used functions for release builds. In debug, we better avoid including OgreSceneNode here.
-#ifdef NDEBUG
+#ifdef _NDEBUG
     inline const Vector3& WorldEntity::getPosition() const
         { return this->node_->getPosition(); }
     inline const Quaternion& WorldEntity::getOrientation() const
-        { return this->node_->getOrientation(); }
+        { return this->node_->getrOrientation(); }
     inline const Vector3& WorldEntity::getScale3D(void) const
         { return this->node_->getScale(); }