Changeset 11704 for code/trunk/src/modules/pickup/PickupManager.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/pickup/PickupManager.h (modified) (4 diffs)

code/trunk/src/modules/pickup/PickupManager.h

@@ -42 +42 @@
 
 #include "PickupRepresentation.h"
-#include "interfaces/Pickupable.h"
+
 #include "util/Singleton.h"
 #include "interfaces/PickupListener.h"
-#include "overlays/hud/HUDPickupSystem.h"
 
 namespace orxonox // tolua_export
@@ -136 +135 @@
 
             void dropPickup(uint32_t pickup); //!< Drop the input Pickupable.
-            static void useUnusePickup(uint32_t index); //tolua_export
             void usePickup(uint32_t pickup, bool use); //!< Use (or unuse) the input Pickupable.
              /**
@@ -149 +147 @@
             static void dropPickupNetworked(uint32_t pickup); //!< Helper method to drop the input pickup on the server.
             static void usePickupNetworked(uint32_t pickup, bool use); //!< Helper method to use (or unuse) the input Pickupable on the server.
-            void setPickupSystem(HUDPickupSystem* system);
 
         private:
-            HUDPickupSystem* pickupSystem;
-            std::vector<Pickupable*> picks;
-
             static PickupManager* singletonPtr_s;
             static const std::string guiName_s; //!< The name of the PickupInventory
@@ -172 +166 @@
             void updateGUI(void); //!< Updates the PickupInventory GUI.
             uint32_t getPickupIndex(void); //!< Get a new index for a Pickupable.
-            
+
     }; // tolua_export