Changeset 7548 for code/trunk

Timestamp:

Oct 16, 2010, 1:22:15 PM (14 years ago)

Author:

dafrick

Message:

Resolving some TODO's.

Location:

code/trunk/src/modules

Files:

• pickup/PickupManager.cc (modified) (1 diff)
• pickup/PickupRepresentation.cc (modified) (1 diff)
• pickup/PickupSpawner.cc (modified) (1 diff)
• pickup/items/DronePickup.cc (modified) (1 diff)
• pickup/items/HealthPickup.cc (modified) (1 diff)
• pickup/items/InvisiblePickup.cc (modified) (1 diff)
• pickup/items/MetaPickup.cc (modified) (1 diff)
• pickup/items/ShieldPickup.cc (modified) (1 diff)
• pickup/items/SpeedPickup.cc (modified) (1 diff)
• questsystem/QuestHint.cc (modified) (1 diff)

code/trunk/src/modules/pickup/PickupManager.cc

@@ -209 +209 @@
         Returns a pointer to the PickupRepresentation.
     */
-    //TODO: Why not return a const?
     PickupRepresentation* PickupManager::getRepresentation(const PickupIdentifier* identifier)
     {

code/trunk/src/modules/pickup/PickupRepresentation.cc

@@ -85 +85 @@
         if(this->isInitialized())
         {
-            //TODO: Also (network) unregister for master.
             if(GameMode::isMaster() && this->pickup_ != NULL)
             {
                 PickupManager::getInstance().unregisterRepresentation(this->pickup_->getPickupIdentifier(), this);
             }
-            if(!GameMode::isMaster())
-            {
-                PickupManager::getInstance().unregisterRepresentation(this);
-            }
+            PickupManager::getInstance().unregisterRepresentation(this);
         }
     }

code/trunk/src/modules/pickup/PickupSpawner.cc

@@ -97 +97 @@
             PickupRepresentation* representation = PickupManager::getInstance().getRepresentation(this->pickup_->getPickupIdentifier());
             this->attach(representation->getSpawnerRepresentation(this));
-            this->setActive(true); //TODO: Needed?
+            this->setActive(true);
         }
     }

code/trunk/src/modules/pickup/items/DronePickup.cc

@@ -130 +130 @@
     {
         SUPER(DronePickup, changedUsed);
-
-        // If the pickup is not picked up nothing must be done.
-        if(!this->isPickedUp())
-            return;
 
         // If the pickup has transited to used.

code/trunk/src/modules/pickup/items/HealthPickup.cc

@@ -187 +187 @@
     {
         SUPER(HealthPickup, changedUsed);
-
-        // If the pickup is not picked up nothing must be done.
-        if(!this->isPickedUp()) //TODO: Needed?
-            return;
 
         // If the pickup has transited to used.

code/trunk/src/modules/pickup/items/InvisiblePickup.cc

@@ -109 +109 @@
     {
         SUPER(InvisiblePickup, changedUsed);
-
-        // If the pickup is not picked up nothing must be done.
-        if(!this->isPickedUp())
-            return;
 
         // If the pickup has transited to used.

code/trunk/src/modules/pickup/items/MetaPickup.cc

@@ -126 +126 @@
                 if(this->getMetaTypeDirect() == pickupMetaType::destroyCarrier)
                 {
-                    this->Pickupable::destroy(); //TODO: Needed?
                     Pawn* pawn = orxonox_cast<Pawn*>(carrier);
                     pawn->kill();

code/trunk/src/modules/pickup/items/ShieldPickup.cc

@@ -126 +126 @@
     {
         SUPER(ShieldPickup, changedUsed);
-
-        // If the pickup is not picked up nothing must be done.
-        if(!this->isPickedUp())
-            return;
 
         Pawn* pawn = this->carrierToPawnHelper();

code/trunk/src/modules/pickup/items/SpeedPickup.cc

@@ -126 +126 @@
     {
         SUPER(SpeedPickup, changedUsed);
-
-        // If the pickup is not picked up nothing must be done.
-        if(!this->isPickedUp())
-            return;
 
         Engine* engine = this->carrierToEngineHelper();

code/trunk/src/modules/questsystem/QuestHint.cc

@@ -90 +90 @@
     bool QuestHint::isActive(const PlayerInfo* player) const
     {
-        //TODO: Replace with asser.
+        //TODO: Replace with assert.
         if(player == NULL) // NULL-Pointers are ugly!
         {