Changeset 2815 for code/branches/gui/src/orxonox

Timestamp:

Mar 21, 2009, 5:56:10 PM (16 years ago)

Author:

rgrieder

Message:

various small changes:

• Fixed a bug in the GameStates concerning return type of virtual functions
• Found some more C-style casts

Location:

code/branches/gui/src/orxonox

Files:

• objects/EventTarget.cc (modified) (1 diff)
• objects/Radar.cc (modified) (1 diff)
• objects/pickup/PickupSpawner.cc (modified) (1 diff)
• overlays/hud/HUDRadar.cc (modified) (1 diff)

code/branches/gui/src/orxonox/objects/EventTarget.cc

@@ -66 +66 @@
     void EventTarget::addAsEvent(BaseObject* object)
     {
-        if (object != (BaseObject*)this)
+        if (object != static_cast<BaseObject*>(this))
             object->addEvent(this, "");
     }

code/branches/gui/src/orxonox/objects/Radar.cc

@@ -144 +144 @@
             for (ObjectList<RadarViewable>::iterator it = ObjectList<RadarViewable>::begin(); it; ++it)
             {
-                if (*it == (RadarViewable*)this->owner_)
+                if (*it == static_cast<RadarViewable*>(this)->owner_)
                     continue;
 

code/branches/gui/src/orxonox/objects/pickup/PickupSpawner.cc

@@ -89 +89 @@
                 ExecutorMember<BaseObject>* executor = createExecutor(createFunctor(&BaseObject::setActive));
                 executor->setDefaultValues(true);
-                RespawnTimer_.setTimer(this->respawntimer_, false, (BaseObject*)this, executor);
+                RespawnTimer_.setTimer(this->respawntimer_, false, this, executor);
                 COUT(0) << "TIMER SET" << std::endl;
         }

code/branches/gui/src/orxonox/overlays/hud/HUDRadar.cc

@@ -94 +94 @@
     void HUDRadar::displayObject(RadarViewable* object, bool bIsMarked)
     {
-        if (object == (RadarViewable*)this->owner_)
+        if (object == static_cast<RadarViewable*>(this->owner_))
             return;