Changeset 9216 in orxonox.OLD for branches/presentation/src

Timestamp:

Jul 5, 2006, 12:32:11 PM (18 years ago)

Author:

rennerc

Message:

reset health on respawn

Location:

branches/presentation/src/world_entities

Files:

• weapons/aiming_system.cc (modified) (1 diff)
• world_entity.cc (modified) (1 diff)

branches/presentation/src/world_entities/weapons/aiming_system.cc

@@ -115 +115 @@
   if( this->owner != killer)
   {
-    PRINTF(0)("real hit: %s\n", killer->getClassName());
+    //PRINTF(0)("real hit: %s\n", killer->getClassName());
     this->selectionList.push_back(killer);
   }

branches/presentation/src/world_entities/world_entity.cc

@@ -572 +572 @@
  */
 void WorldEntity::reset()
-{}
+{
+  this->setHealth( this->getHealthMax() );
+}
 
 /**