Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 16, 2010, 1:22:15 PM (14 years ago)
Author:
dafrick
Message:

Resolving some TODO's.

Location:
code/trunk/src/modules/pickup
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/modules/pickup/PickupManager.cc

    r7547 r7548  
    209209        Returns a pointer to the PickupRepresentation.
    210210    */
    211     //TODO: Why not return a const?
    212211    PickupRepresentation* PickupManager::getRepresentation(const PickupIdentifier* identifier)
    213212    {
  • code/trunk/src/modules/pickup/PickupRepresentation.cc

    r7540 r7548  
    8585        if(this->isInitialized())
    8686        {
    87             //TODO: Also (network) unregister for master.
    8887            if(GameMode::isMaster() && this->pickup_ != NULL)
    8988            {
    9089                PickupManager::getInstance().unregisterRepresentation(this->pickup_->getPickupIdentifier(), this);
    9190            }
    92             if(!GameMode::isMaster())
    93             {
    94                 PickupManager::getInstance().unregisterRepresentation(this);
    95             }
     91            PickupManager::getInstance().unregisterRepresentation(this);
    9692        }
    9793    }
  • code/trunk/src/modules/pickup/PickupSpawner.cc

    r7547 r7548  
    9797            PickupRepresentation* representation = PickupManager::getInstance().getRepresentation(this->pickup_->getPickupIdentifier());
    9898            this->attach(representation->getSpawnerRepresentation(this));
    99             this->setActive(true); //TODO: Needed?
     99            this->setActive(true);
    100100        }
    101101    }
  • code/trunk/src/modules/pickup/items/DronePickup.cc

    r7547 r7548  
    130130    {
    131131        SUPER(DronePickup, changedUsed);
    132 
    133         // If the pickup is not picked up nothing must be done.
    134         if(!this->isPickedUp())
    135             return;
    136132
    137133        // If the pickup has transited to used.
  • code/trunk/src/modules/pickup/items/HealthPickup.cc

    r7547 r7548  
    187187    {
    188188        SUPER(HealthPickup, changedUsed);
    189 
    190         // If the pickup is not picked up nothing must be done.
    191         if(!this->isPickedUp()) //TODO: Needed?
    192             return;
    193189
    194190        // If the pickup has transited to used.
  • code/trunk/src/modules/pickup/items/InvisiblePickup.cc

    r7547 r7548  
    109109    {
    110110        SUPER(InvisiblePickup, changedUsed);
    111 
    112         // If the pickup is not picked up nothing must be done.
    113         if(!this->isPickedUp())
    114             return;
    115111
    116112        // If the pickup has transited to used.
  • code/trunk/src/modules/pickup/items/MetaPickup.cc

    r7547 r7548  
    126126                if(this->getMetaTypeDirect() == pickupMetaType::destroyCarrier)
    127127                {
    128                     this->Pickupable::destroy(); //TODO: Needed?
    129128                    Pawn* pawn = orxonox_cast<Pawn*>(carrier);
    130129                    pawn->kill();
  • code/trunk/src/modules/pickup/items/ShieldPickup.cc

    r7547 r7548  
    126126    {
    127127        SUPER(ShieldPickup, changedUsed);
    128 
    129         // If the pickup is not picked up nothing must be done.
    130         if(!this->isPickedUp())
    131             return;
    132128
    133129        Pawn* pawn = this->carrierToPawnHelper();
  • code/trunk/src/modules/pickup/items/SpeedPickup.cc

    r7547 r7548  
    126126    {
    127127        SUPER(SpeedPickup, changedUsed);
    128 
    129         // If the pickup is not picked up nothing must be done.
    130         if(!this->isPickedUp())
    131             return;
    132128
    133129        Engine* engine = this->carrierToEngineHelper();
Note: See TracChangeset for help on using the changeset viewer.