Changeset 3301 for code/trunk/src/orxonox/objects

Timestamp:

Jul 18, 2009, 4:03:59 PM (15 years ago)

Author:

rgrieder

Message:

Found even more casts. They sure aren't all of them, but I hope to have caught every pointer C-style cast because they can be very dangerous.
Note: I didn't do the pointer casts in the network library because that would have taken way too long.

Location:

code/trunk/src/orxonox/objects

Files:

• Scene.cc (modified) (1 diff)
• collisionshapes/CollisionShape.h (modified) (1 diff)
• controllers/WaypointPatrolController.cc (modified) (1 diff)
• gametypes/TeamDeathmatch.cc (modified) (1 diff)
• gametypes/UnderAttack.cc (modified) (1 diff)
• weaponsystem/Munition.cc (modified) (1 diff)
• weaponsystem/WeaponSystem.h (modified) (1 diff)
• worldentities/ParticleEmitter.h (modified) (1 diff)
• worldentities/WorldEntity.h (modified) (2 diffs)

code/trunk/src/orxonox/objects/Scene.cc

@@ -325 +325 @@
     {
         // get the WorldEntity pointers
-        WorldEntity* object0 = (WorldEntity*)colObj0->getUserPointer();
+        WorldEntity* object0 = static_cast<WorldEntity*>(colObj0->getUserPointer());
         assert(dynamic_cast<WorldEntity*>(object0));
-        WorldEntity* object1 = (WorldEntity*)colObj1->getUserPointer();
+        WorldEntity* object1 = static_cast<WorldEntity*>(colObj1->getUserPointer());
         assert(dynamic_cast<WorldEntity*>(object1));
 

code/trunk/src/orxonox/objects/collisionshapes/CollisionShape.h

@@ -63 +63 @@
             virtual void setScale3D(const Vector3& scale);
             virtual void setScale(float scale);
-            inline const Vector3& getScale3D(void) const
+            inline const Vector3& getScale3D() const
                 { return this->scale_; }
 

code/trunk/src/orxonox/objects/controllers/WaypointPatrolController.cc

@@ -85 +85 @@
 
         Vector3 myposition = this->getControllableEntity()->getPosition();
-        float shortestsqdistance = (unsigned int)-1;
+        float shortestsqdistance = static_cast<unsigned int>(-1);
 
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)

code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc

@@ -74 +74 @@
                 playersperteam[it->second]++;
 
-        unsigned int minplayers = (unsigned int)-1;
+        unsigned int minplayers = static_cast<unsigned int>(-1);
         size_t minplayersteam = 0;
         for (size_t i = 0; i < this->teams_; ++i)

code/trunk/src/orxonox/objects/gametypes/UnderAttack.cc

@@ -51 +51 @@
 
         this->setConfigValues();
-        this->timesequence_ = static_cast<this->gameTime_);
+        this->timesequence_ = static_cast<int>(this->gameTime_);
     }
 

code/trunk/src/orxonox/objects/weaponsystem/Munition.cc

@@ -354 +354 @@
             return false;
 
-        if (amount <= (unsigned int)needed_magazines)
+        if (amount <= static_cast<unsigned int>(needed_magazines))
         {
             // We need more magazines than we get, so just add them

code/trunk/src/orxonox/objects/weaponsystem/WeaponSystem.h

@@ -84 +84 @@
 
             static const unsigned int MAX_FIRE_MODES = 8;
-            static const unsigned int FIRE_MODE_UNASSIGNED = (unsigned int)-1;
+            static const unsigned int FIRE_MODE_UNASSIGNED = static_cast<unsigned int>(-1);
 
             static const unsigned int MAX_WEAPON_MODES = 8;
-            static const unsigned int WEAPON_MODE_UNASSIGNED = (unsigned int)-1;
+            static const unsigned int WEAPON_MODE_UNASSIGNED = static_cast<unsigned int>(-1);
 
         private:

code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.h

@@ -66 +66 @@
                 { this->LOD_ = static_cast<LODParticle::Value>(level); this->LODchanged(); }
             inline unsigned int getLODxml() const
-                { return (unsigned int)this->LOD_; }
+                { return static_cast<unsigned int>(this->LOD_); }
 
             void sourceChanged();

code/trunk/src/orxonox/objects/worldentities/WorldEntity.h

@@ -148 +148 @@
             inline void setScale3D(float x, float y, float z)
                 { this->setScale3D(Vector3(x, y, z)); }
-            const Vector3& getScale3D(void) const;
+            const Vector3& getScale3D() const;
             const Vector3& getWorldScale3D() const;
 
@@ -457 +457 @@
     inline const Quaternion& WorldEntity::getOrientation() const
         { return this->node_->getOrientation(); }
-    inline const Vector3& WorldEntity::getScale3D(void) const
+    inline const Vector3& WorldEntity::getScale3D() const
         { return this->node_->getScale(); }
 #endif