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

Timestamp:

Jan 6, 2018, 3:16:00 AM (6 years ago)

Author:

landauf

Message:

[HUD_HS16] fixed wrong dependency between overlays and pickup module: pickup should NOT depend on overlays; instead overlays should use pickup.

also reverted all changes from HUD_HS16 in PickupManager for several reasons:

• calling HUDPickupSystem is not necessary anymore due to the fixed dependencies
• adding a console command is not necessary because there is already a full GUI for this purpose (press F4)
• limiting the number of pickups to 10 is a bad idea because PickupManager manages pickups for ALL players in the game

File:

• code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified) (2 diffs)

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

@@ -37 +37 @@
 #include "util/OgreForwardRefs.h"
 #include "overlays/OrxonoxOverlay.h"
+#include "tools/interfaces/Tickable.h"
 
 namespace orxonox
 {
-    class _OverlaysExport HUDPickupSystem : public OrxonoxOverlay
+    class _OverlaysExport HUDPickupSystem : public OrxonoxOverlay, public Tickable
     {
     public:
@@ -46 +47 @@
         virtual ~HUDPickupSystem();
 
-        void sizeChanged();
-        void sync(std::vector<Pickupable*> p, std::map<Pickupable*, uint32_t> indexes_);
+        virtual void tick(float dt) override;
+        virtual void sizeChanged() override;
 
     private: