Changeset 10274 in orxonox.OLD for branches/playability/src/world_entities/space_ships

Timestamp:

Jan 17, 2007, 6:42:07 PM (18 years ago)

Author:

marcscha

Message:

fixes and workaround bugs of Orx

Location:

branches/playability/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (1 diff)
• space_ship.h (modified) (2 diffs)

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -1040 +1040 @@
 }
 
-void SpaceShip::hit(float damage, WorldEntity* killer)
+void SpaceShip::hit( float damage, WorldEntity* killer)
 {
   this->damage(killer->getDamage(),0);

branches/playability/src/world_entities/space_ships/space_ship.h

@@ -59 +59 @@
 
     virtual void process(const Event &event);
+//    virtual void hit (WorldEntity* entity, float damage);
 
     inline WeaponManager& getWeaponManagerSecondary() { return this->secWeaponMan; };
@@ -204 +205 @@
     Trail*                trailR;              //!< Burst trail
 
-//    Wobblegrid*           test;
 
 };