Changeset 7007 for code/branches/presentation3/src/modules

Timestamp:

May 29, 2010, 8:41:19 PM (14 years ago)

Author:

dafrick

Message:

Tested and cleaned all levels (except for the ones that someone is working on at the moment).
Two levels had old Pickups in them, they have been updated to work properly now.
All levels except one are working. The one that isn't is the presentationHS09b level, which crashes due to LOD.

File:

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

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

@@ -146 +146 @@
     void Pickup::setActivationType(const std::string& type)
     {
-        if(type == activationTypeImmediate_s)
+        if(Pickup::activationTypeImmediate_s.compare(type))
         {
             this->activationType_ = pickupActivationType::immediate;
         }
-        else if(type == activationTypeOnUse_s)
+        else if(Pickup::activationTypeOnUse_s.compare(type))
         {
             this->activationType_ = pickupActivationType::onUse;
@@ -168 +168 @@
     void Pickup::setDurationType(const std::string& type)
     {
-        if(type == durationTypeOnce_s)
+        if(Pickup::durationTypeOnce_s.compare(type) == 0)
         {
             this->durationType_ = pickupDurationType::once;
         }
-        else if(type == durationTypeContinuous_s)
+        else if(Pickup::durationTypeContinuous_s.compare(type) == 0)
         {
             this->durationType_ = pickupDurationType::continuous;