Changeset 8777 in orxonox.OLD for trunk/src/world_entities/world_entity.cc

Timestamp:

Jun 26, 2006, 12:59:13 AM (18 years ago)

Author:

patrick

Message:

trunk: damage and distruction reimplemented

File:

• trunk/src/world_entities/world_entity.cc (modified) (4 diffs)

trunk/src/world_entities/world_entity.cc

@@ -38 +38 @@
 #include "collision_handle.h"
 #include "collision_event.h"
+#include "game_rules.h"
+#include "kill.h"
 
 #include <stdarg.h>
@@ -82 +84 @@
 
   // registering default reactions:
-//   this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
+  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
 
   this->toList(OM_NULL);
@@ -736 +738 @@
   this->decreaseHealth(damage);
 
+  PRINTF(0)("Hit me: %s now only %f/%f health\n", this->getClassName(), this->getHealth(), this->getHealthMax());
+
   if( this->getHealth() > 0)
   {
@@ -744 +748 @@
     this->destroy();
 
-//     if( State::getGameRules() != NULL)
-//       State::getGameRules()->registerKill(Kill(NULL, this));
-  }
+    if( State::getGameRules() != NULL)
+      State::getGameRules()->registerKill(Kill(NULL, this));
+  }
+}
+
+
+/**
+ * destoys the world entity
+ */
+void WorldEntity::destroy()
+{
+  PRINTF(0)("Destroy\n");
+  this->toList(OM_DEAD);
 }