Changeset 11336 for code/branches/HUD_HS16/src/modules/pickup

Timestamp:

Dec 12, 2016, 4:20:50 PM (8 years ago)

Author:

patricwi

Message:

finished version of HUD and PickupSystem. crash bug remaining

Location:

code/branches/HUD_HS16/src/modules/pickup

Files:

• PickupManager.cc (modified) (6 diffs)
• PickupManager.h (modified) (1 diff)

code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc

@@ -266 +266 @@
         assert(pickup);
 
-
         for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
             pickupSystem = hud;
         
-        assert(pickupSystem); //pickupSystem HAS to be there!
-
         if(!GameMode::isMaster()) // If this is neither standalone nor the server.
             return;
@@ -300 +297 @@
             this->pickups_[index] = pickup;
 
-            orxout() << "the pickup is: " << pickup << endl;
-
             this->picks.push_back(pickup);
 
-            pickupSystem->updatePickupList(picks);
+            if(pickupSystem)
+                pickupSystem->updatePickupList(picks, indexes_);
             
         }
@@ -319 +315 @@
             this->picks.erase(std::remove(this->picks.begin(), this->picks.end(), pickup), this->picks.end()); //remove pickup from vector
 
-            pickupSystem->removePickup(pickup);
+            if(pickupSystem)
+                pickupSystem->removePickup(pickup);
         }
 
@@ -349 +346 @@
     //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) 
     {
-        orxout() << "Hello there I was here " << index << endl;
-
         PickupManager& manager = PickupManager::getInstance();
 
@@ -360 +356 @@
         if(pickup==nullptr)
         {
-            orxout() << "The pickup does not exist." << endl;
             return;                       //pickup does not exist
         }
 
-        orxout() << "The pickup is being used: " << pickup->isUsed() << endl;
-
+        //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())
@@ -563 +559 @@
         }
         //all slots are full and we have to drop sth
-        orxout() << "everything was full and we have now dropped the first element" << endl;
+        orxout(internal_info, context::pickups) << "everything was full and we have now dropped the first element" << endl;
         this->dropPickup(0);
         return 0;

code/branches/HUD_HS16/src/modules/pickup/PickupManager.h

@@ -172 +172 @@
             void updateGUI(void); //!< Updates the PickupInventory GUI.
             uint32_t getPickupIndex(void); //!< Get a new index for a Pickupable.
-
-            void addKeyBindingForNewPickup(Pickupable* pickup, uint32_t index);
-            void removeKeyBindingForOldPickup(Pickupable* pickup, uint32_t index);
             
     }; // tolua_export