Changeset 3205 for code/trunk/src

Timestamp:

Jun 22, 2009, 1:12:13 PM (16 years ago)

Author:

rgrieder

Message:

Removed a few warnings.

Location:

code/trunk/src/orxonox

Files:

• gamestates/GSDedicated.cc (modified) (2 diffs)
• objects/worldentities/Light.cc (modified) (3 diffs)

code/trunk/src/orxonox/gamestates/GSDedicated.cc

@@ -60 +60 @@
         , timeSinceLastUpdate_(0)
         , closeThread_(false)
+        , cleanLine_(true)
         , inputIterator_(0)
-        , cleanLine_(true)
         , cursorX_(0)
         , cursorY_(0)
@@ -117 +117 @@
         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;
         }

code/trunk/src/orxonox/objects/worldentities/Light.cc

@@ -127 +127 @@
     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);
     }
@@ -133 +133 @@
     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);
     }
@@ -169 +169 @@
             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();
         }