Changeset 11700 for code/trunk/src/modules/overlays/hud/HUDPickupSystem.h

Timestamp:

Jan 6, 2018, 12:15:25 AM (6 years ago)

Author:

landauf

Message:

merged the remaining commits of HUD_HS16 branch back to trunk (except commit r11392 which added DDDialogue that seems to be just a test)

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/overlays/hud/HUDPickupSystem.h (modified) (1 diff)

code/trunk/src/modules/overlays/hud/HUDPickupSystem.h

@@ -57 +57 @@
 
         void sizeChanged();
-        void updatePickupList(std::vector<Pickupable*> picks, std::map<Pickupable*, uint32_t> indexes_);  
-        void createPickupList();  
-        void removePickup(Pickupable* pickup);
+        void sync(std::vector<Pickupable*> p, std::map<Pickupable*, uint32_t> indexes_);
 
         bool repaint=true; //if we shouldnt repaint, set this to false