Changeset 7007 for code/branches/presentation3/src/modules
- Timestamp:
- May 29, 2010, 8:41:19 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3/src/modules/pickup/Pickup.cc
r6709 r7007 146 146 void Pickup::setActivationType(const std::string& type) 147 147 { 148 if( type == activationTypeImmediate_s)148 if(Pickup::activationTypeImmediate_s.compare(type)) 149 149 { 150 150 this->activationType_ = pickupActivationType::immediate; 151 151 } 152 else if( type == activationTypeOnUse_s)152 else if(Pickup::activationTypeOnUse_s.compare(type)) 153 153 { 154 154 this->activationType_ = pickupActivationType::onUse; … … 168 168 void Pickup::setDurationType(const std::string& type) 169 169 { 170 if( type == durationTypeOnce_s)170 if(Pickup::durationTypeOnce_s.compare(type) == 0) 171 171 { 172 172 this->durationType_ = pickupDurationType::once; 173 173 } 174 else if( type == durationTypeContinuous_s)174 else if(Pickup::durationTypeContinuous_s.compare(type) == 0) 175 175 { 176 176 this->durationType_ = pickupDurationType::continuous;
Note: See TracChangeset
for help on using the changeset viewer.