Changeset 11325 for code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc

Timestamp:

Dec 8, 2016, 6:34:27 PM (8 years ago)

Author:

patricwi

Message:

visualization finished, bug when ending or reloading the level

File:

• code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc (modified) (4 diffs)

code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc

@@ -314 +314 @@
 
             this->indexes_.erase(pickup);
-            this->pickups_.find(index)->second=nullptr; //set to null, so that can be identified as free slot by getPickupIndex()
+            this->pickups_.erase(index); //set to null, so that can be identified as free slot by getPickupIndex()
 
 
@@ -355 +355 @@
         PickupManager& manager = PickupManager::getInstance();
 
+        if(!manager.pickups_.count(index)) return; //if pickup is no longer here, dont do anything
+
         Pickupable* pickup=manager.pickups_.find(index)->second;
         if(pickup==nullptr)
@@ -364 +366 @@
         orxout() << "The pickup is being used: " << pickup->isUsed() << endl;
 
-        pickup->drop(true);
+        manager.dropPickup(index);
+
         // if(pickup->isUsed())
         //     manager.usePickup(index, false);
@@ -557 +560 @@
         for(uint32_t i=0; i<10; i++)
         {
-            if(pickups_.find(i)->second==nullptr) return i;
+            if(!pickups_.count(i)) return i;
         }
         //all slots are full and we have to drop sth