Changeset 10758 in orxonox.OLD for branches/presentation/src/world_entities/space_ships/space_ship.cc

Timestamp:

Jun 21, 2007, 1:37:21 AM (17 years ago)

Author:

nicolasc

Message:

added shield functionality, reverted paeddae's MP patch - does not work

File:

• branches/presentation/src/world_entities/space_ships/space_ship.cc (modified) (2 diffs)

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

@@ -428 +428 @@
 void SpaceShip::tick (float time)
 {
+  
+  printf("Ship Status: %f, %f\n", this->getHealth(), this->getShield());
+  
   if(caminit)
   {
@@ -1081 +1084 @@
 void SpaceShip::hit( float damage, WorldEntity * killer )
 {
-  PRINTF(4)("SS HIT: %f\n", this->getHealth() );
+  printf("SS HIT: %f, %f \n", this->getHealth() , this->getShield());
   Playable::hit( damage, killer );
-  PRINTF(4)("SS HIT: %f\n", this->getHealth() );  
+  PRINTF(4)("SS HIT: %f\n", this->getHealth());
 }