Changeset 7102 in orxonox.OLD for trunk/src/world_entities/power_ups
- Timestamp:
- Feb 7, 2006, 8:56:57 PM (19 years ago)
- Location:
- trunk/src/world_entities/power_ups
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/world_entities/power_ups/power_up.cc
r7077 r7102 47 47 this->pickupBuffer = NULL; 48 48 this->respawnBuffer = NULL; 49 50 this->collider = NULL; 49 51 } 50 52 … … 120 122 if(entity->isA(CL_EXTENDABLE)) 121 123 { 124 this->collider = entity; 122 125 if(dynamic_cast<Extendable*>(entity)->pickup(this)) 123 126 { … … 144 147 { 145 148 this->toList(OM_COMMON); 149 this->collider = NULL; 146 150 if (likely(this->respawnBuffer != NULL)) 147 151 this->soundSource.play(this->respawnBuffer); -
trunk/src/world_entities/power_ups/power_up.h
r7077 r7102 53 53 float respawnStart; 54 54 static const char* respawnTypes[]; 55 56 WorldEntity* collider; 55 57 }; 56 58
Note: See TracChangeset
for help on using the changeset viewer.