[Orxonox-commit 1610] r6328 - in code/branches/presentation2/src/orxonox: controllers items

[landauf at orxonox.net]

Author: landauf
Date: 2009-12-12 19:08:51 +0100 (Sat, 12 Dec 2009)
New Revision: 6328

Modified:
   code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
   code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc
Log:
warnings -= 2

Modified: code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc	2009-12-12 16:45:57 UTC (rev 6327)
+++ code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc	2009-12-12 18:08:51 UTC (rev 6328)
@@ -61,15 +61,15 @@
         : HumanController(creator)
         , crossHairOverlay_(NULL)
         , centerOverlay_(NULL)
-        , arrowsOverlay1_(NULL)
-        , arrowsOverlay2_(NULL)
-        , arrowsOverlay3_(NULL)
-        , arrowsOverlay4_(NULL)
         , damageOverlayTop_(NULL)
         , damageOverlayRight_(NULL)
         , damageOverlayBottom_(NULL)
         , damageOverlayLeft_(NULL)
         , damageOverlayTT_(0)
+        , arrowsOverlay1_(NULL)
+        , arrowsOverlay2_(NULL)
+        , arrowsOverlay3_(NULL)
+        , arrowsOverlay4_(NULL)
     {
         RegisterObject(NewHumanController);
 

Modified: code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc
===================================================================
--- code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc	2009-12-12 16:45:57 UTC (rev 6327)
+++ code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc	2009-12-12 18:08:51 UTC (rev 6328)
@@ -114,7 +114,7 @@
         if (this->getShip())
         {
             if (this->getShip()->hasLocalController())
-                this->steeringDirectionZ_ = this->getDirection().z;
+                this->steeringDirectionZ_ = (int)this->getDirection().z;
             if (GameMode::isMaster())
             {
                 const Vector3& velocity = this->getShip()->getLocalVelocity();