[Orxonox-commit 373] r2975 - in branches/netp2/src: network orxonox/objects/worldentities

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-05-13 14:25:04 +0200 (Wed, 13 May 2009)
New Revision: 2975

Modified:
   branches/netp2/src/network/Host.h
   branches/netp2/src/orxonox/objects/worldentities/MobileEntity.h
Log:
- Fixed stupid bug in MobileEntity.h
- Removed a compiler warning

Modified: branches/netp2/src/network/Host.h
===================================================================
--- branches/netp2/src/network/Host.h	2009-05-13 11:58:44 UTC (rev 2974)
+++ branches/netp2/src/network/Host.h	2009-05-13 12:25:04 UTC (rev 2975)
@@ -37,7 +37,7 @@
 
   const int CLIENTID_SERVER = 0;
   const unsigned int NETWORK_FREQUENCY = 25;
-  const float NETWORK_PERIOD = 1./NETWORK_FREQUENCY;
+  const float NETWORK_PERIOD = 1.0f/NETWORK_FREQUENCY;
 
 /**
 *       @brief Base class of Server and Client

Modified: branches/netp2/src/orxonox/objects/worldentities/MobileEntity.h
===================================================================
--- branches/netp2/src/orxonox/objects/worldentities/MobileEntity.h	2009-05-13 11:58:44 UTC (rev 2974)
+++ branches/netp2/src/orxonox/objects/worldentities/MobileEntity.h	2009-05-13 12:25:04 UTC (rev 2975)
@@ -60,7 +60,7 @@
             inline void setAngularVelocity(float x, float y, float z)
                 { this->setAngularVelocity(Vector3(x, y, z)); }
             inline const Vector3& getAngularVelocity() const
-                { return this->linearAcceleration_; }
+                { return this->angularVelocity_; }
 
             void setAcceleration(const Vector3& acceleration);
             inline void setAcceleration(float x, float y, float z)