Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3205 for code/trunk


Ignore:
Timestamp:
Jun 22, 2009, 1:12:13 PM (15 years ago)
Author:
rgrieder
Message:

Removed a few warnings.

Location:
code/trunk/src/orxonox
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/gamestates/GSDedicated.cc

    r3198 r3205  
    6060        , timeSinceLastUpdate_(0)
    6161        , closeThread_(false)
     62        , cleanLine_(true)
    6263        , inputIterator_(0)
    63         , cleanLine_(true)
    6464        , cursorX_(0)
    6565        , cursorY_(0)
     
    117117        else
    118118        {
    119             usleep((unsigned int)((NETWORK_PERIOD - timeSinceLastUpdate_)*1000*1000 ));
    120             usleep(NETWORK_PERIOD*1000*1000); // NOTE: this is to throttle the non-network framerate
     119            msleep(static_cast<unsigned int>((NETWORK_PERIOD - timeSinceLastUpdate_)*1000));
     120            msleep(static_cast<unsigned int>(NETWORK_PERIOD*1000)); // NOTE: this is to throttle the non-network framerate
    121121//            COUT(0) << "sleeping for " << (int)((NETWORK_PERIOD - timeSinceLastUpdate_) * 1000 * 1000) << " usec" << endl;
    122122        }
  • code/trunk/src/orxonox/objects/worldentities/Light.cc

    r3196 r3205  
    127127    void Light::updateAttenuation()
    128128    {
    129         if (this->light_ && this->type_ != Ogre::Light::LT_DIRECTIONAL)
     129        if (this->light_ && this->type_ != Light::LT_DIRECTIONAL)
    130130            this->light_->setAttenuation(this->attenuation_.x, this->attenuation_.y, this->attenuation_.z, this->attenuation_.w);
    131131    }
     
    133133    void Light::updateSpotlightRange()
    134134    {
    135         if (this->light_ && this->type_ == Ogre::Light::LT_SPOTLIGHT)
     135        if (this->light_ && this->type_ == Light::LT_SPOTLIGHT)
    136136            this->light_->setSpotlightRange(Degree(this->spotlightRange_.x), Degree(this->spotlightRange_.y), this->spotlightRange_.z);
    137137    }
     
    169169            this->light_->setType(static_cast<Ogre::Light::LightTypes>(this->type_));
    170170
    171             if (this->type_ != Ogre::Light::LT_DIRECTIONAL)
     171            if (this->type_ != Light::LT_DIRECTIONAL)
    172172                this->updateAttenuation();
    173             if (this->type_ == Ogre::Light::LT_SPOTLIGHT)
     173            if (this->type_ == Light::LT_SPOTLIGHT)
    174174                this->updateSpotlightRange();
    175175        }
Note: See TracChangeset for help on using the changeset viewer.