Changeset 9705 in orxonox.OLD for branches/new_class_id/src/world_entities/playable.cc
- Timestamp:
- Aug 25, 2006, 9:44:53 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/new_class_id/src/world_entities/playable.cc
r9691 r9705 41 41 SHELL_COMMAND_STATIC(orxoWeapon, Playable, Playable::addSomeWeapons_CHEAT) 42 42 ->setAlias("orxoWeapon"); 43 NewObjectListDefinition(Playable) 43 NewObjectListDefinition(Playable); 44 44 45 45 Playable::Playable() … … 48 48 playmode(Playable::Full3D) 49 49 { 50 this->registerObject(this, Playable::_ classID);50 this->registerObject(this, Playable::_objectList); 51 51 PRINTF(4)("PLAYABLE INIT\n"); 52 52 … … 109 109 bool Playable::pickup(PowerUp* powerUp) 110 110 { 111 if(powerUp->isA(CL_WEAPON_POWER_UP)) 112 { 113 return dynamic_cast<WeaponPowerUp*>(powerUp)->process(&this->getWeaponManager()); 114 } 115 else if(powerUp->isA(CL_PARAM_POWER_UP)) 116 { 117 ParamPowerUp* ppu = dynamic_cast<ParamPowerUp*>(powerUp); 111 /// FIXME TOTALLY 112 if(powerUp->isA(WeaponPowerUp::classID())) 113 { 114 return static_cast<WeaponPowerUp*>(powerUp)->process(&this->getWeaponManager()); 115 } 116 else if(powerUp->isA(ParamPowerUp::classID())) 117 { 118 ParamPowerUp* ppu = static_cast<ParamPowerUp*>(powerUp); 118 119 switch(ppu->getType()) 119 120 { … … 213 214 { 214 215 PRINTF(2)("ADDING WEAPONS - you cheater\n"); 215 playable->addWeapon(Weapon::createWeapon( CL_HYPERBLASTER));216 playable->addWeapon(Weapon::createWeapon( CL_TURRET));217 playable->addWeapon(Weapon::createWeapon( CL_AIMING_TURRET));218 playable->addWeapon(Weapon::createWeapon( CL_CANNON));219 playable->addWeapon(Weapon::createWeapon( CL_TARGETING_TURRET));216 playable->addWeapon(Weapon::createWeapon("Hyperblaster")); 217 playable->addWeapon(Weapon::createWeapon("Turret")); 218 playable->addWeapon(Weapon::createWeapon("AimingTurret")); 219 playable->addWeapon(Weapon::createWeapon("Cannon")); 220 playable->addWeapon(Weapon::createWeapon("TargetingTurret")); 220 221 PRINTF(2)("ADDING WEAPONS FINISHED\n"); 221 222 }
Note: See TracChangeset
for help on using the changeset viewer.