Changeset 11704 for code/trunk/src/modules/pickup/PickupManager.cc

Timestamp:

Jan 6, 2018, 3:16:00 AM (7 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.cc (modified) (10 diffs)

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

@@ -41 +41 @@
 #include "network/Host.h"
 #include "network/NetworkFunctionIncludes.h"
-#include "core/input/KeyBinderManager.h"    //for keybinding
-#include "core/input/KeyBinder.h"           //for keybinding
-#include "core/command/ConsoleCommandIncludes.h"
 
 #include "infos/PlayerInfo.h"
@@ -51 +48 @@
 #include "CollectiblePickup.h"
 #include "PickupRepresentation.h"
-#include "overlays/hud/HUDPickupSystem.h"
 
 namespace orxonox
@@ -67 +63 @@
 
     RegisterAbstractClass(PickupManager).inheritsFrom<PickupListener>();
-
-    SetConsoleCommand("useUnusePickup", &PickupManager::useUnusePickup).addShortcut().setActive(true);
 
     /**
@@ -265 +259 @@
         assert(pickup);
 
-        for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
-            pickupSystem = hud;
-        
         if(!GameMode::isMaster()) // If this is neither standalone nor the server.
             return;
@@ -295 +286 @@
             this->indexes_[pickup] = index;
             this->pickups_[index] = pickup;
-
-            this->picks.push_back(pickup);
-
-            if(pickupSystem)
-                pickupSystem->sync(picks, indexes_);
-            
         }
         else // If it was dropped, it is removed from the required lists.
@@ -308 +293 @@
             index = it->second;
 
-            this->indexes_.erase(pickup);
-            this->pickups_.erase(index); //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
-
-            if(pickupSystem)
-                pickupSystem->sync(picks, indexes_);
+            // Remove the Pickupable from the indexes_ and pickups_ list.
+            this->indexes_.erase(it);
+            this->pickups_.erase(index);
         }
 
@@ -342 +322 @@
 
     }
-
-    //This function is called by the command line or by the key binding
-    //it uses or unuses the pickup, depending on its current state
-    //or drops it (depends what you comment/uncomment)
-    void PickupManager::useUnusePickup(uint32_t index) 
-    {
-        PickupManager& manager = PickupManager::getInstance();
-
-        if(!manager.pickups_.count(index)) return; //if pickup is no longer here, dont do anything
-
-        Pickupable* pickup=manager.pickups_.find(index)->second;
-        if(pickup==nullptr)
-        {
-            return;                       //pickup does not exist
-        }
-
-        //if the pickup should be dropped upon key press
-        manager.dropPickup(index);
-
-        //if the pickup should be used/unused upon key press
-
-        // if(pickup->isUsed())
-        //     manager.usePickup(index, false);
-        // else
-        //     manager.usePickup(index, true);
-    }
-
 
     /**
@@ -448 +401 @@
             Pickupable* pickupable = this->pickups_.find(pickup)->second;
             if(pickupable != nullptr)
-            {
                 pickupable->drop();
-
-            }
         }
         // If we're neither server nor standalone we drop the pickup by calling dropPickupNetworked() of the PickupManager on the server.
@@ -544 +494 @@
     /**
     @brief
-        Get a new index between 0 and 9 for a Pickupable.
-        If all slots are occupied, the Pickupable in the first slot will be dropped.
+        Get a new index for a Pickupable.
+        This will work as long as the number of Pickupables that are picked up is sufficiently small and as long as they don't exist forever.
     @return
         Returns the new index.
@@ -551 +501 @@
     uint32_t PickupManager::getPickupIndex(void)
     {
-        //check if there are free slots available
-
-        for(uint32_t i=0; i<10; i++)
-        {
-            if(!pickups_.count(i)) return i;
-        }
-        //all slots are full and we have to drop sth
-        orxout(internal_info, context::pickups) << "everything was full and we have now dropped the first element" << endl;
-        this->dropPickup(0);
-        return 0;
+        if(this->pickupHighestIndex_ == uint32_t(~0x0)-1) // If we've reached the highest possible number, we wrap around.
+            this->pickupHighestIndex_ = 0;
+        return this->pickupHighestIndex_++;
     }