Changeset 9319 for code/branches/presentation2012merge/src/modules/pickup/Pickup.cc

Timestamp:

Jul 21, 2012, 3:34:45 PM (13 years ago)

Author:

landauf

Message:

refactored PickupSpawner - it doesn't clone a sample-pickup anymore, it creates new pickups from a template.
removed DroppedPickup because it is not needed anymore, PickupSpawner has now the same functionality.
the representation of the pickup spawner is now destroyed if the pickup is taken and re-created if it spawns again (instead of changing the visibility). makes it easier to change the pickup in a spawner during the game.
adjusted all level files accordingly

File:

• code/branches/presentation2012merge/src/modules/pickup/Pickup.cc (modified) (3 diffs)

code/branches/presentation2012merge/src/modules/pickup/Pickup.cc

@@ -37 +37 @@
 #include "util/StringUtils.h"
 
-#include "DroppedPickup.h"
+#include "PickupSpawner.h"
 
 namespace orxonox
@@ -201 +201 @@
     @brief
         Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
-        This method must be implemented by any class directly inheriting from Pickupable. It is most easily done by just creating a new DroppedPickup, e.g.:
-        DroppedPickup(BaseObject* creator, Pickupable* pickup, const Vector3& position);
     @return
         Returns true if a spawner was created, false if not.
@@ -208 +206 @@
     bool Pickup::createSpawner(void)
     {
-        new DroppedPickup(this, this, this->getCarrier());
+        PickupSpawner::createDroppedPickup(this, this, this->getCarrier());
         return true;
     }