Changeset 10235 in orxonox.OLD for branches/playability/src/world_entities/projectiles/spike_ball.cc
- Timestamp:
- Jan 14, 2007, 4:34:23 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/playability/src/world_entities/projectiles/spike_ball.cc
r10229 r10235 31 31 #include "space_ships/space_ship.h" 32 32 33 #include "weapons/weapon.h"34 #include "../weapons/weapon_manager.h"33 // #include "weapons/weapon.h" 34 // #include "../weapons/weapon_manager.h" 35 35 36 36 #include "class_id_DEPRECATED.h" … … 41 41 * standard constructor 42 42 */ 43 SpikeBall::SpikeBall () : Projectile ()43 SpikeBall::SpikeBall () : ProjectileWeapon() 44 44 { 45 45 this->registerObject(this, SpikeBall::_objectList); … … 65 65 this->halo->setSize(2, 2); 66 66 this->halo->setTexture("hbolt_halo.png"); 67 67 /* 68 68 this->weaponMan = new WeaponManager(dynamic_cast<WorldEntity*>(this)); 69 69 this->weaponMan->setParentEntity(this); … … 77 77 this->weaponMan->changeWeaponConfig(0); 78 78 79 this->weaponMan->getWeapon(0)->increaseEnergy(50); 79 this->weaponMan->getWeapon(0)->increaseEnergy(50);*/ 80 80 } 81 81 … … 195 195 void SpikeBall::destroy (WorldEntity* killer) 196 196 { 197 Projectile ::destroy( killer );197 ProjectileWeapon::destroy( killer ); 198 198 PRINTF(5)("DESTROY SpikeBall\n"); 199 199 this->lifeCycle = .95; //!< @todo calculate this usefully.
Note: See TracChangeset
for help on using the changeset viewer.