Changeset 7183 for code/trunk

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:

• libraries/network/synchronisable/Synchronisable.cc (modified) (1 diff)
• modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) (1 diff)
• orxonox/ChatInputHandler.cc (modified) (5 diffs)
• orxonox/controllers/ArtificialController.cc (modified) (1 diff)
• orxonox/graphics/MeshLodInformation.cc (modified) (1 diff)
• orxonox/graphics/Model.cc (modified) (1 diff)
• orxonox/weaponsystem/WeaponSystem.cc (modified) (1 diff)
• orxonox/worldentities/pawns/FpsPlayer.cc (modified) (1 diff)

code/trunk/src/libraries/network/synchronisable/Synchronisable.cc

@@ -93 +93 @@
     syncList_.clear();
     stringList_.clear();
-    std::map<uint32_t, Synchronisable*>::iterator it;
-    it = objectMap_.find(objectID_);
-    if (it != objectMap_.end())
-      objectMap_.erase(it);
+    std::map<uint32_t, Synchronisable*>::iterator it2;
+    it2 = objectMap_.find(objectID_);
+    if (it2 != objectMap_.end())
+      objectMap_.erase(it2);
 
   }

code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -54 +54 @@
 
             this->setMunitionName("TargetSeeking Rockets");
-            this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4);
+            this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4f);
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
     }

code/trunk/src/orxonox/ChatInputHandler.cc

@@ -129 +129 @@
     { this->text_colors[ i ] = new CEGUI::colour( red, green, blue );
       assert( this->text_colors[ i ] );
-      green += 0.2, blue += 0.2;
+      green += 0.2f, blue += 0.2f;
     }
 
@@ -137 +137 @@
     { this->text_colors[ i ] = new CEGUI::colour( red, green, blue );
       assert( this->text_colors[ i ] );
-      red += 0.2, blue += 0.2;
+      red += 0.2f, blue += 0.2f;
     }
 
@@ -145 +145 @@
     { this->text_colors[ i ] = new CEGUI::colour( red, green, blue );
       assert( this->text_colors[ i ] );
-      red += 0.2, green += 0.2;
+      red += 0.2f, green += 0.2f;
     }
   }
@@ -275 +275 @@
     {
       /* adjust curser position - magic number 5 for font width */
-      sub_adjust_dispoffset( (this->input->getUnclippedInnerRect().getWidth()/6),
+      sub_adjust_dispoffset( (int)(this->input->getUnclippedInnerRect().getWidth()/6),
         cursorpos, assembled.length() );
       this->input->setProperty( "Text", assembled.substr( disp_offset ) );
@@ -282 +282 @@
     {
       /* adjust curser position - magic number 5 for font width */
-      sub_adjust_dispoffset( (this->inputonly->getUnclippedInnerRect().getWidth()/6),
+      sub_adjust_dispoffset( (int)(this->inputonly->getUnclippedInnerRect().getWidth()/6),
         cursorpos, assembled.length() );
       this->inputonly->setProperty( "Text", assembled.substr( disp_offset) );

code/trunk/src/orxonox/controllers/ArtificialController.cc

@@ -498 +498 @@
             {
                 pos = Vector3::ZERO;
-                if (i <= 1) pos += dest  + FORMATION_WIDTH*(orient*WorldEntity::LEFT);
-                if (i == 2) pos += dest  + FORMATION_WIDTH*(orient*WorldEntity::RIGHT);
-                if (i == 3) pos += dest  + FORMATION_WIDTH*(orient*WorldEntity::UP);
+                if (i <= 1) pos += dest  + (float)FORMATION_WIDTH*(orient*WorldEntity::LEFT);
+                if (i == 2) pos += dest  + (float)FORMATION_WIDTH*(orient*WorldEntity::RIGHT);
+                if (i == 3) pos += dest  + (float)FORMATION_WIDTH*(orient*WorldEntity::UP);
                 if (i >= 4)
                 {
-                    pos += dest  + FORMATION_WIDTH*(orient*WorldEntity::DOWN);
+                    pos += dest  + (float)FORMATION_WIDTH*(orient*WorldEntity::DOWN);
                     i = 1;
-                    dest += FORMATION_LENGTH*(orient*WorldEntity::BACK);
+                    dest += (float)FORMATION_LENGTH*(orient*WorldEntity::BACK);
                     (*it)->setTargetPosition(pos);
                     continue;

code/trunk/src/orxonox/graphics/MeshLodInformation.cc

@@ -41 +41 @@
 
     MeshLodInformation::MeshLodInformation(BaseObject* creator)
-    : BaseObject(creator), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15)
+    : BaseObject(creator), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15f)
     {
         RegisterObject(MeshLodInformation);

code/trunk/src/orxonox/graphics/Model.cc

@@ -44 +44 @@
 
     Model::Model(BaseObject* creator) :
-        StaticEntity(creator), bCastShadows_(true), lodLevel_(5), bLodEnabled_(true), numLodLevels_(10), lodReductionRate_(.15)
+        StaticEntity(creator), bCastShadows_(true), lodLevel_(5), bLodEnabled_(true), numLodLevels_(10), lodReductionRate_(.15f)
     {
         RegisterObject(Model);

code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc

@@ -222 +222 @@
 
         // Remove the WeaponPack from the WeaponSystem
-        std::vector<WeaponPack*>::iterator it = std::find(this->weaponPacks_.begin(),this->weaponPacks_.end(), wPack);
-        assert(it !=this->weaponPacks_.end());
-        this->weaponPacks_.erase(it);
+        std::vector<WeaponPack*>::iterator it2 = std::find(this->weaponPacks_.begin(),this->weaponPacks_.end(), wPack);
+        assert(it2 !=this->weaponPacks_.end());
+        this->weaponPacks_.erase(it2);
     }
 

code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc

@@ -171 +171 @@
 
                 Radian pitch = this->cameraPositionRootNode_->getOrientation().getPitch();
-                if (pitch < Radian(1.5707) && pitch > Radian(-1.5707))
+                if (pitch < Radian(1.5707f) && pitch > Radian(-1.5707f))
                 {
                     this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
                 }
-                else if (pitch < Radian(-1.5707))
+                else if (pitch < Radian(-1.5707f))
                 {
-                    if (this->pitch_ > 0.0)
+                    if (this->pitch_ > 0.0f)
                         this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
-                    else if (pitch < Radian(-1.571))
-                        this->cameraPositionRootNode_->pitch(-pitch + Radian(-1.570796));
+                    else if (pitch < Radian(-1.571f))
+                        this->cameraPositionRootNode_->pitch(-pitch + Radian(-1.570796f));
                 }
-                else if (pitch > Radian(1.5707))
+                else if (pitch > Radian(1.5707f))
                 {
-                    if (this->pitch_ < 0.0)
+                    if (this->pitch_ < 0.0f)
                         this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
-                    else if (pitch > Radian(1.571))
-                        this->cameraPositionRootNode_->pitch(-pitch + Radian(1.570796));
+                    else if (pitch > Radian(1.571f))
+                        this->cameraPositionRootNode_->pitch(-pitch + Radian(1.570796f));
                 }
                 this->weaponNode_->setOrientation(this->cameraPositionRootNode_->getOrientation());