Changeset 7077 in orxonox.OLD for trunk/src/world_entities/power_ups
- Timestamp:
- Feb 7, 2006, 4:06:56 PM (19 years ago)
- Location:
- trunk/src/world_entities/power_ups
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/world_entities/power_ups/power_up.cc
r7066 r7077 144 144 { 145 145 this->toList(OM_COMMON); 146 this->soundSource.play(this->respawnBuffer); 146 if (likely(this->respawnBuffer != NULL)) 147 this->soundSource.play(this->respawnBuffer); 147 148 148 149 } -
trunk/src/world_entities/power_ups/power_up.h
r7066 r7077 40 40 PowerUp(float r, float g, float b); 41 41 virtual ~PowerUp (); 42 43 protected: 42 44 Model* model; 43 45 -
trunk/src/world_entities/power_ups/weapon_power_up.cc
r7065 r7077 34 34 { 35 35 this->init(); 36 this->loadPickupSound("sound/powerups/whats this2.wav");37 36 if( root != NULL) 38 37 this->loadParams(root); … … 48 47 { 49 48 this->setClassID(CL_WEAPON_POWER_UP, "WeaponPowerUp"); 49 this->loadPickupSound("sound/powerups/whats this2.wav"); 50 50 51 this->weaponXML = NULL; 51 52 this->weapon = NULL; … … 95 96 { 96 97 this->weapon = dynamic_cast<Weapon*>(Factory::fabricate(name)); 98 if (this->weapon == NULL) 99 { 100 PRINTF(1)("Unable to load Weapon. %s\n", name); 101 this->weapon = dynamic_cast<Weapon*>(Factory::fabricate("Turret")); 102 } 97 103 this->model = this->weapon->getModel(0); 98 104 }
Note: See TracChangeset
for help on using the changeset viewer.