Changeset 11354 for code/trunk/src

Timestamp:

Mar 9, 2017, 2:50:27 PM (8 years ago)

Author:

patricwi

Message:

merged updated HUD branch to trunk

Location:

code/trunk

Files:

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

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

@@ -61 +61 @@
         }
     }
+
+    void HUDPickupSystem::sizeChanged()
+    {
+        OrxonoxOverlay::sizeChanged();
+
+    }
+    
 
     void HUDPickupSystem::updatePickupList(std::vector<Pickupable*> picks, std::map<Pickupable*, uint32_t> indexes_)

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

@@ -56 +56 @@
         virtual ~HUDPickupSystem();
 
+        void sizeChanged();
         void updatePickupList(std::vector<Pickupable*> picks, std::map<Pickupable*, uint32_t> indexes_);  
         void createPickupList();