Changeset 3300 for code/trunk/src/orxonox/overlays/hud

Timestamp:

Jul 17, 2009, 11:53:35 PM (15 years ago)

Author:

rgrieder

Message:

Found a few more C-Style casts.

Location:

code/trunk/src/orxonox/overlays/hud

Files:

• GametypeStatus.cc (modified) (1 diff)
• HUDBar.cc (modified) (1 diff)
• HUDHealthBar.cc (modified) (1 diff)
• HUDTimer.cc (modified) (1 diff)

code/trunk/src/orxonox/overlays/hud/GametypeStatus.cc

@@ -70 +70 @@
             {
                 if (gtinfo->isStartCountdownRunning())
-                    this->setCaption(multi_cast<std::string>((int)ceil(gtinfo->getStartCountdown())));
+                    this->setCaption(multi_cast<std::string>(static_cast<int>(ceil(gtinfo->getStartCountdown()))));
                 else if (ce->isA(Class(Spectator)))
                     this->setCaption("Press [Fire] to respawn");

code/trunk/src/orxonox/overlays/hud/HUDBar.cc

@@ -73 +73 @@
         // create new material
         std::string materialname = "barmaterial" + multi_cast<std::string>(materialcount_s++);
-        Ogre::MaterialPtr material = (Ogre::MaterialPtr)Ogre::MaterialManager::getSingleton().create(materialname, "General");
+        Ogre::MaterialPtr material = static_cast<Ogre::MaterialPtr>(Ogre::MaterialManager::getSingleton().create(materialname, "General"));
         material->getTechnique(0)->getPass(0)->setSceneBlending(Ogre::SBT_TRANSPARENT_ALPHA);
         this->textureUnitState_ = material->getTechnique(0)->getPass(0)->createTextureUnitState();

code/trunk/src/orxonox/overlays/hud/HUDHealthBar.cc

@@ -83 +83 @@
         {
             this->setValue(this->owner_->getHealth() / this->owner_->getInitialHealth());
-            this->textoverlay_->setCaption(multi_cast<std::string>((int)this->owner_->getHealth()));
+            this->textoverlay_->setCaption(multi_cast<std::string>(static_cast<int>(this->owner_->getHealth())));
         }
 

code/trunk/src/orxonox/overlays/hud/HUDTimer.cc

@@ -59 +59 @@
             if (gametype->getTimerIsActive())
             {
-                this->setCaption(multi_cast<std::string>((int)gametype->getTime() + 1));
+                this->setCaption(multi_cast<std::string>(static_cast<int>(gametype->getTime()) + 1));
             }
         }