Changeset 7008 for code/branches/presentation3/src/modules/pickup/Pickup.cc

Timestamp:

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

Author:

dafrick

Message:

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

File:

• code/branches/presentation3/src/modules/pickup/Pickup.cc (modified) (2 diffs)

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;