[Orxonox-commit 673] r3205 - in trunk/src/orxonox: gamestates objects/worldentities

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-06-22 13:12:13 +0200 (Mon, 22 Jun 2009)
New Revision: 3205

Modified:
   trunk/src/orxonox/gamestates/GSDedicated.cc
   trunk/src/orxonox/objects/worldentities/Light.cc
Log:
Removed a few warnings.

Modified: trunk/src/orxonox/gamestates/GSDedicated.cc
===================================================================
--- trunk/src/orxonox/gamestates/GSDedicated.cc	2009-06-21 17:55:00 UTC (rev 3204)
+++ trunk/src/orxonox/gamestates/GSDedicated.cc	2009-06-22 11:12:13 UTC (rev 3205)
@@ -59,8 +59,8 @@
         , server_(0)
         , timeSinceLastUpdate_(0)
         , closeThread_(false)
+        , cleanLine_(true)
         , inputIterator_(0)
-        , cleanLine_(true)
         , cursorX_(0)
         , cursorY_(0)
     {
@@ -116,8 +116,8 @@
         }
         else
         {
-            usleep((unsigned int)((NETWORK_PERIOD - timeSinceLastUpdate_)*1000*1000 ));
-            usleep(NETWORK_PERIOD*1000*1000); // NOTE: this is to throttle the non-network framerate
+            msleep(static_cast<unsigned int>((NETWORK_PERIOD - timeSinceLastUpdate_)*1000));
+            msleep(static_cast<unsigned int>(NETWORK_PERIOD*1000)); // NOTE: this is to throttle the non-network framerate
 //            COUT(0) << "sleeping for " << (int)((NETWORK_PERIOD - timeSinceLastUpdate_) * 1000 * 1000) << " usec" << endl;
         }
         processQueue();

Modified: trunk/src/orxonox/objects/worldentities/Light.cc
===================================================================
--- trunk/src/orxonox/objects/worldentities/Light.cc	2009-06-21 17:55:00 UTC (rev 3204)
+++ trunk/src/orxonox/objects/worldentities/Light.cc	2009-06-22 11:12:13 UTC (rev 3205)
@@ -126,13 +126,13 @@
 
     void Light::updateAttenuation()
     {
-        if (this->light_ && this->type_ != Ogre::Light::LT_DIRECTIONAL)
+        if (this->light_ && this->type_ != Light::LT_DIRECTIONAL)
             this->light_->setAttenuation(this->attenuation_.x, this->attenuation_.y, this->attenuation_.z, this->attenuation_.w);
     }
 
     void Light::updateSpotlightRange()
     {
-        if (this->light_ && this->type_ == Ogre::Light::LT_SPOTLIGHT)
+        if (this->light_ && this->type_ == Light::LT_SPOTLIGHT)
             this->light_->setSpotlightRange(Degree(this->spotlightRange_.x), Degree(this->spotlightRange_.y), this->spotlightRange_.z);
     }
 
@@ -168,9 +168,9 @@
         {
             this->light_->setType(static_cast<Ogre::Light::LightTypes>(this->type_));
 
-            if (this->type_ != Ogre::Light::LT_DIRECTIONAL)
+            if (this->type_ != Light::LT_DIRECTIONAL)
                 this->updateAttenuation();
-            if (this->type_ == Ogre::Light::LT_SPOTLIGHT)
+            if (this->type_ == Light::LT_SPOTLIGHT)
                 this->updateSpotlightRange();
         }
     }