Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7183 for code/trunk


Ignore:
Timestamp:
Aug 18, 2010, 7:49:31 PM (14 years ago)
Author:
rgrieder
Message:

Removed a load of warnings for VS 2005 and possibly VS 2008.

Location:
code/trunk/src
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/libraries/network/synchronisable/Synchronisable.cc

    r7163 r7183  
    9393    syncList_.clear();
    9494    stringList_.clear();
    95     std::map<uint32_t, Synchronisable*>::iterator it;
    96     it = objectMap_.find(objectID_);
    97     if (it != objectMap_.end())
    98       objectMap_.erase(it);
     95    std::map<uint32_t, Synchronisable*>::iterator it2;
     96    it2 = objectMap_.find(objectID_);
     97    if (it2 != objectMap_.end())
     98      objectMap_.erase(it2);
    9999
    100100  }
  • code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

    r7163 r7183  
    5454
    5555            this->setMunitionName("TargetSeeking Rockets");
    56             this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4);
     56            this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4f);
    5757        // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
    5858    }
  • code/trunk/src/orxonox/ChatInputHandler.cc

    r7163 r7183  
    129129    { this->text_colors[ i ] = new CEGUI::colour( red, green, blue );
    130130      assert( this->text_colors[ i ] );
    131       green += 0.2, blue += 0.2;
     131      green += 0.2f, blue += 0.2f;
    132132    }
    133133
     
    137137    { this->text_colors[ i ] = new CEGUI::colour( red, green, blue );
    138138      assert( this->text_colors[ i ] );
    139       red += 0.2, blue += 0.2;
     139      red += 0.2f, blue += 0.2f;
    140140    }
    141141
     
    145145    { this->text_colors[ i ] = new CEGUI::colour( red, green, blue );
    146146      assert( this->text_colors[ i ] );
    147       red += 0.2, green += 0.2;
     147      red += 0.2f, green += 0.2f;
    148148    }
    149149  }
     
    275275    {
    276276      /* adjust curser position - magic number 5 for font width */
    277       sub_adjust_dispoffset( (this->input->getUnclippedInnerRect().getWidth()/6),
     277      sub_adjust_dispoffset( (int)(this->input->getUnclippedInnerRect().getWidth()/6),
    278278        cursorpos, assembled.length() );
    279279      this->input->setProperty( "Text", assembled.substr( disp_offset ) );
     
    282282    {
    283283      /* adjust curser position - magic number 5 for font width */
    284       sub_adjust_dispoffset( (this->inputonly->getUnclippedInnerRect().getWidth()/6),
     284      sub_adjust_dispoffset( (int)(this->inputonly->getUnclippedInnerRect().getWidth()/6),
    285285        cursorpos, assembled.length() );
    286286      this->inputonly->setProperty( "Text", assembled.substr( disp_offset) );
  • code/trunk/src/orxonox/controllers/ArtificialController.cc

    r7163 r7183  
    498498            {
    499499                pos = Vector3::ZERO;
    500                 if (i <= 1) pos += dest  + FORMATION_WIDTH*(orient*WorldEntity::LEFT);
    501                 if (i == 2) pos += dest  + FORMATION_WIDTH*(orient*WorldEntity::RIGHT);
    502                 if (i == 3) pos += dest  + FORMATION_WIDTH*(orient*WorldEntity::UP);
     500                if (i <= 1) pos += dest  + (float)FORMATION_WIDTH*(orient*WorldEntity::LEFT);
     501                if (i == 2) pos += dest  + (float)FORMATION_WIDTH*(orient*WorldEntity::RIGHT);
     502                if (i == 3) pos += dest  + (float)FORMATION_WIDTH*(orient*WorldEntity::UP);
    503503                if (i >= 4)
    504504                {
    505                     pos += dest  + FORMATION_WIDTH*(orient*WorldEntity::DOWN);
     505                    pos += dest  + (float)FORMATION_WIDTH*(orient*WorldEntity::DOWN);
    506506                    i = 1;
    507                     dest += FORMATION_LENGTH*(orient*WorldEntity::BACK);
     507                    dest += (float)FORMATION_LENGTH*(orient*WorldEntity::BACK);
    508508                    (*it)->setTargetPosition(pos);
    509509                    continue;
  • code/trunk/src/orxonox/graphics/MeshLodInformation.cc

    r7163 r7183  
    4141
    4242    MeshLodInformation::MeshLodInformation(BaseObject* creator)
    43     : BaseObject(creator), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15)
     43    : BaseObject(creator), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15f)
    4444    {
    4545        RegisterObject(MeshLodInformation);
  • code/trunk/src/orxonox/graphics/Model.cc

    r7166 r7183  
    4444
    4545    Model::Model(BaseObject* creator) :
    46         StaticEntity(creator), bCastShadows_(true), lodLevel_(5), bLodEnabled_(true), numLodLevels_(10), lodReductionRate_(.15)
     46        StaticEntity(creator), bCastShadows_(true), lodLevel_(5), bLodEnabled_(true), numLodLevels_(10), lodReductionRate_(.15f)
    4747    {
    4848        RegisterObject(Model);
  • code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc

    r7163 r7183  
    222222
    223223        // Remove the WeaponPack from the WeaponSystem
    224         std::vector<WeaponPack*>::iterator it = std::find(this->weaponPacks_.begin(),this->weaponPacks_.end(), wPack);
    225         assert(it !=this->weaponPacks_.end());
    226         this->weaponPacks_.erase(it);
     224        std::vector<WeaponPack*>::iterator it2 = std::find(this->weaponPacks_.begin(),this->weaponPacks_.end(), wPack);
     225        assert(it2 !=this->weaponPacks_.end());
     226        this->weaponPacks_.erase(it2);
    227227    }
    228228
  • code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc

    r7163 r7183  
    171171
    172172                Radian pitch = this->cameraPositionRootNode_->getOrientation().getPitch();
    173                 if (pitch < Radian(1.5707) && pitch > Radian(-1.5707))
     173                if (pitch < Radian(1.5707f) && pitch > Radian(-1.5707f))
    174174                {
    175175                    this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
    176176                }
    177                 else if (pitch < Radian(-1.5707))
     177                else if (pitch < Radian(-1.5707f))
    178178                {
    179                     if (this->pitch_ > 0.0)
     179                    if (this->pitch_ > 0.0f)
    180180                        this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
    181                     else if (pitch < Radian(-1.571))
    182                         this->cameraPositionRootNode_->pitch(-pitch + Radian(-1.570796));
     181                    else if (pitch < Radian(-1.571f))
     182                        this->cameraPositionRootNode_->pitch(-pitch + Radian(-1.570796f));
    183183                }
    184                 else if (pitch > Radian(1.5707))
     184                else if (pitch > Radian(1.5707f))
    185185                {
    186                     if (this->pitch_ < 0.0)
     186                    if (this->pitch_ < 0.0f)
    187187                        this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
    188                     else if (pitch > Radian(1.571))
    189                         this->cameraPositionRootNode_->pitch(-pitch + Radian(1.570796));
     188                    else if (pitch > Radian(1.571f))
     189                        this->cameraPositionRootNode_->pitch(-pitch + Radian(1.570796f));
    190190                }
    191191                this->weaponNode_->setOrientation(this->cameraPositionRootNode_->getOrientation());
Note: See TracChangeset for help on using the changeset viewer.