Changeset 8511 in orxonox.OLD for branches

Timestamp:

Jun 16, 2006, 12:36:51 AM (18 years ago)

Author:

patrick

Message:

bsp: hit function reintroduced, now collision reaction should do better

Location:

branches/bsp_model/src

Files:

• lib/collision_reaction/cr_object_damage.cc (modified) (2 diffs)
• world_entities/playable.cc (modified) (2 diffs)
• world_entities/playable.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (3 diffs)

branches/bsp_model/src/lib/collision_reaction/cr_object_damage.cc

@@ -63 +63 @@
   if( collision->isEntityACollide()) {
     damage = collision->getEntityB()->getDamage();
-    collision->getEntityA()->decreaseHealth(damage);
+    collision->getEntityA()->hit(damage);
   }
   PRINTF(4)("Dealing damage - %f damage to %s \n", damage, collision->getEntityA()->getClassName());
@@ -69 +69 @@
   if( collision->isEntityBCollide()) {
     damage = collision->getEntityA()->getDamage();
-    collision->getEntityB()->decreaseHealth(damage);
+    collision->getEntityB()->hit(damage);
   }
   PRINTF(4)("Dealing damage - %f damage to %s \n", damage, collision->getEntityB()->getClassName());

branches/bsp_model/src/world_entities/playable.cc

@@ -376 +376 @@
     if (this->getHealth() <= 0.0f)
     {
-      this->die();
+//       this->destory();
 
       if( State::getGameRules() != NULL)
@@ -411 +411 @@
 
 
-void Playable::die()
+
+void Playable::destroy()
 {
   Explosion::explode(dynamic_cast<PNode*>(this), Vector(1.0f, 1.0f, 1.0f));

branches/bsp_model/src/world_entities/playable.h

@@ -76 +76 @@
 
   // WorldEntity Extensions
-  virtual void die();
+  virtual void destroy();
   virtual void respawn();
   virtual void collidesWith(WorldEntity* entity, const Vector& location);

branches/bsp_model/src/world_entities/world_entity.cc

@@ -727 +727 @@
 }
 
+
+/**
+ * hit the world entity with
+ *  @param damage damage to be dealt
+ */
+void WorldEntity::hit(float damage)
+{
+  this->decreaseHealth(damage);
+
+  if( this->getHealth() > 0)
+  {
+    // any small explosion animaitions
+  }
+  else
+  {
+    this->destroy();
+
+//     if( State::getGameRules() != NULL)
+//       State::getGameRules()->registerKill(Kill(NULL, this));
+  }
+}
+
+
 /**
  * @brief updates the HealthWidget

branches/bsp_model/src/world_entities/world_entity.h

@@ -61 +61 @@
   virtual void postSpawn ();
   virtual void leaveWorld ();
-  virtual void destroy() {};
 
   virtual void tick (float time);
@@ -95 +94 @@
   CollisionHandle* getCollisionHandle(CREngine::CRType type) const { return this->collisionHandles[type]; }
 
+  virtual void hit(float damage);
+  virtual void destroy() {};
+
 
   /* @returns the Count of Faces on this WorldEntity */
@@ -113 +115 @@
   /** @returns a Reference to the Iterator */
   ObjectManager::EntityList::iterator& getEntityIterator() { return this->objectListIterator; }
-
-  /* --- Network Block --- */
-  int       writeState(const byte* data, int length, int sender);
-  int       readState(byte* data, int maxLength );
 
   /* --- Character Attribute Block --- */