Changeset 10180 in orxonox.OLD for branches/playability/src/world_entities/projectiles
- Timestamp:
- Jan 4, 2007, 10:29:09 PM (18 years ago)
- Location:
- branches/playability/src/world_entities/projectiles
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/playability/src/world_entities/projectiles/hbolt.cc
r10159 r10180 113 113 } 114 114 115 115 /* 116 116 void HBolt::collidesWith(WorldEntity* entity, const Vector& location) 117 117 { … … 122 122 dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage()); 123 123 this->deactivate(); 124 } 124 }*/ 125 125 126 126 -
branches/playability/src/world_entities/projectiles/hbolt.h
r10104 r10180 27 27 virtual void deactivate(); 28 28 29 virtual void collidesWith(WorldEntity* entity, const Vector& location);29 // virtual void collidesWith(WorldEntity* entity, const Vector& location); 30 30 31 31 virtual void destroy (WorldEntity* killer); -
branches/playability/src/world_entities/projectiles/lbolt.cc
r10117 r10180 115 115 } 116 116 117 117 /* 118 118 void LBolt::collidesWith(WorldEntity* entity, const Vector& location) 119 119 { … … 124 124 dynamic_cast<SpaceShip*>(entity)->damage(this->getDamage(),0); 125 125 // this->deactivate(); 126 } 126 }*/ 127 127 128 128 /** -
branches/playability/src/world_entities/projectiles/lbolt.h
r10074 r10180 27 27 virtual void deactivate(); 28 28 29 virtual void collidesWith(WorldEntity* entity, const Vector& location);29 // virtual void collidesWith(WorldEntity* entity, const Vector& location); 30 30 31 31 virtual void destroy (WorldEntity* killer); -
branches/playability/src/world_entities/projectiles/mbolt.cc
r10170 r10180 141 141 } 142 142 143 143 /* 144 144 void MBolt::collidesWith(WorldEntity* entity, const Vector& location) 145 145 { … … 157 157 //entity->destroy(this); 158 158 //this->deactivate(); 159 } 159 }*/ 160 160 161 161 /** -
branches/playability/src/world_entities/projectiles/mbolt.h
r10117 r10180 28 28 virtual void deactivate(); 29 29 30 virtual void collidesWith(WorldEntity* entity, const Vector& location);30 // virtual void collidesWith(WorldEntity* entity, const Vector& location); 31 31 32 32 virtual void destroy (WorldEntity* killer); -
branches/playability/src/world_entities/projectiles/spike_ball.cc
r10170 r10180 30 30 31 31 #include "space_ships/space_ship.h" 32 33 #include "weapons/weapon.h" 32 34 33 35 … … 58 60 59 61 this->angle = 0; 60 this->rotationSpeed = 130;62 this->rotationSpeed = 0; 61 63 /* 62 64 this->halo = new Billboard();
Note: See TracChangeset
for help on using the changeset viewer.