Changeset 7008

Timestamp:

May 29, 2010, 9:33:33 PM (14 years ago)

Author:

dafrick

Message:

Fixed a bug in pickups that caused the clone method of Pickup.h not to be called via SUPER.

Location:

code/branches/presentation3

Files:

• data/levels/pickups.oxw (modified) (4 diffs)
• src/libraries/core/OrxonoxClass.h (modified) (1 diff)
• src/modules/pickup/Pickup.cc (modified) (2 diffs)
• src/modules/pickup/Pickup.h (modified) (1 diff)
• src/modules/pickup/items/HealthPickup.cc (modified) (2 diffs)

code/branches/presentation3/data/levels/pickups.oxw

@@ -25 +25 @@
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
     <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
 
     <!-- Shield pickups -->
@@ -135 +134 @@
     <!-- Pickup Collection pickups -->
 
-    <PickupSpawner position="-50,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+    <PickupSpawner position="-50,25,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
       <pickup>
         <PickupCollection template=triplehealthspeedinvisibilitypickup />
@@ -141 +140 @@
     </PickupSpawner>
 
-        <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
+    <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
     <PickupRepresentation
       pickupName = "Medium Health Pack"
@@ -153 +152 @@
     </PickupRepresentation>
 
-    <PickupSpawner position="-50,25,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
+    <PickupSpawner position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
       <pickup>
-        <HealthPickup health=50 activationType=onUse durationType=continuous />
+        <HealthPickup health=50 activationType=onUse durationType=once />
       </pickup>
     </PickupSpawner>

code/branches/presentation3/src/libraries/core/OrxonoxClass.h

@@ -173 +173 @@
     };
     
-    SUPER_FUNCTION(11, OrxonoxClass, clone, true);
+    SUPER_FUNCTION(11, OrxonoxClass, clone, false);
     
 }

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

@@ -48 +48 @@
     /*static*/ const std::string Pickup::durationTypeOnce_s = "once";
     /*static*/ const std::string Pickup::durationTypeContinuous_s = "continuous";
+
+    CreateUnloadableFactory(Pickup);
 
     Pickup::Pickup(BaseObject* creator) : BaseObject(creator)
@@ -146 +148 @@
     void Pickup::setActivationType(const std::string& type)
     {
-        if(Pickup::activationTypeImmediate_s.compare(type))
+        if(Pickup::activationTypeImmediate_s.compare(type) == 0)
         {
             this->activationType_ = pickupActivationType::immediate;
         }
-        else if(Pickup::activationTypeOnUse_s.compare(type))
+        else if(Pickup::activationTypeOnUse_s.compare(type) == 0)
         {
             this->activationType_ = pickupActivationType::onUse;

code/branches/presentation3/src/modules/pickup/Pickup.h

@@ -77 +77 @@
     {
 
-        protected:
+        public:
             Pickup(BaseObject* creator); //!< Constructor.
-
-        public:
             virtual ~Pickup(); //!< Destructor.
 

code/branches/presentation3/src/modules/pickup/items/HealthPickup.cc

@@ -189 +189 @@
     {
         SUPER(HealthPickup, changedUsed);
-        
+
         //! If the pickup is not picked up nothing must be done.
         if(!this->isPickedUp())
@@ -290 +290 @@
         if(item == NULL)
             item = new HealthPickup(this);
-        
+
         SUPER(HealthPickup, clone, item);
-        
+
         HealthPickup* pickup = dynamic_cast<HealthPickup*>(item);
         pickup->setHealth(this->getHealth());