Changeset 7539 for code/trunk/src/modules/pickup

Timestamp:

Oct 13, 2010, 10:57:13 PM (14 years ago)

Author:

dafrick

Message:

Some cleanup in PickupManager.

Location:

code/trunk/src/modules/pickup

Files:

• PickupManager.cc (modified) (7 diffs)
• PickupRepresentation.h (modified) (1 diff)

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

@@ -34 +34 @@
 #include "PickupManager.h"
 
-#include "util/Convert.h"
-#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
 #include "core/LuaState.h"
@@ -42 +40 @@
 #include "network/Host.h"
 #include "network/NetworkFunction.h"
-
+#include "util/ScopedSingletonManager.h"
+
+#include "infos/PlayerInfo.h"
 #include "interfaces/PickupCarrier.h"
-#include "infos/PlayerInfo.h"
 #include "worldentities/pawns/Pawn.h"
 
@@ -96 +95 @@
         this->representationsNetworked_.clear();
 
-        //TODO: Destroying properly?
-        //TODO: Shouldnt these list be empty, to avoid problems when switching levels?
         // Destroying all the PickupInventoryContainers that are still there.
         for(std::map<uint32_t, PickupInventoryContainer*>::iterator it = this->pickupInventoryContainers_.begin(); it != this->pickupInventoryContainers_.end(); it++)
@@ -484 +481 @@
     {
         // If we're either server or standalone and the list of pickups is not empty, we find and drop the input pickup.
-        if(GameMode::isMaster() && !this->pickups_.empty())
-        {
+        if(GameMode::isMaster())
+        {
+            if(this->pickups_.empty())
+                return;
             Pickupable* pickupable = this->pickups_.find(pickup)->second->get();
             if(pickupable != NULL)
@@ -509 +508 @@
         {
             PickupManager& manager = PickupManager::getInstance();
-            //TODO: Just call dropPickup() on manager?
-            if(manager.pickups_.empty())
-                return;
-            Pickupable* pickupable = manager.pickups_.find(pickup)->second->get();
-            if(pickupable != NULL)
-                pickupable->drop();
+            manager.dropPickup(pickup);
         }
     }
@@ -530 +524 @@
     {
         // If we're either server or standalone and the list of pickups is not empty, we find and change the used status of the input pickup.
-        if(GameMode::isMaster() && !this->pickups_.empty())
-        {
+        if(GameMode::isMaster())
+        {
+            if(this->pickups_.empty())
+                return;
             Pickupable* pickupable = this->pickups_.find(pickup)->second->get();
             if(pickupable != NULL)
@@ -557 +553 @@
         {
             PickupManager& manager = PickupManager::getInstance();
-            //TODO: Just call usePickup() on manager?
-            if(manager.pickups_.empty())
-                return;
-            Pickupable* pickupable = manager.pickups_.find(pickup)->second->get();
-            if(pickupable != NULL)
-                pickupable->setUsed(use);
+            manager.usePickup(pickup, use);
         }
     }

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

@@ -54 +54 @@
         The PickupRepresentation class represents a specific pickup type (identified by its PickupIdentifier). It defines the information displayed in the GUI and how PickupSpawners that spawn the pickup type look like.
         They are created through XML and are registered with the PickupManager.
+
+    @author
+        Damian 'Mozork' Frick
+
+    @ingroup Pickup
     */
     class _PickupExport PickupRepresentation // tolua_export