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

Timestamp:

Nov 28, 2016, 7:21:35 PM (7 years ago)

Author:

patricwi

Message:

linker problem solved, visuals work as long as only 1 item is picked up.

File:

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

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

@@ -83 +83 @@
     }
 
-    void PickupManager::setPickupSystem(HUDPickupSystem* system)
-    {
-        pickupSystem=system;
-    }
-
     /**
     @brief
@@ -271 +266 @@
         assert(pickup);
 
+        if(!pickupSystem)
+        {
+            for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
+                pickupSystem = hud;
+        }
+        assert(pickupSystem); //pickupSystem HAS to be there!
+
         if(!GameMode::isMaster()) // If this is neither standalone nor the server.
             return;
@@ -299 +301 @@
             this->pickups_[index] = pickup;
 
-            //TODO
-            std::vector<Pickupable*> picks;
-
-            PickupManager& manager = PickupManager::getInstance();
-            
-            Pickupable* pickup = nullptr;
-
-            for(uint32_t i = 0; i!=10; i++)
-            {
-                pickup=manager.pickups_.find(i)->second;
-                picks.push_back(pickup);
-            }
-            // pickupSystem->updatePickupList(picks);
+            orxout() << "the pickup is: " << pickup << endl;
+
+            this->picks.push_back(pickup);
+
+            pickupSystem->updatePickupList(picks);
             
         }
@@ -320 +314 @@
             index = it->second;
 
-            
             this->indexes_.erase(pickup);
             this->pickups_.find(index)->second=nullptr; //set to null, so that can be identified as free slot by getPickupIndex()
+
+
+            this->picks.erase(std::remove(this->picks.begin(), this->picks.end(), pickup), this->picks.end()); //remove pickup from vector
+
+            pickupSystem->removePickup(pickup);
+            pickupSystem->updatePickupList(picks);
         }