Changeset 7072 in orxonox.OLD for trunk/src/world_entities/playable.cc

Timestamp:

Feb 7, 2006, 3:06:34 PM (18 years ago)

Author:

bensch

Message:

collision stuff

File:

• trunk/src/world_entities/playable.cc (modified) (3 diffs)

trunk/src/world_entities/playable.cc

@@ -125 +125 @@
 void Playable::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (entity->isA(CL_PROJECTILE) && !State::isOnline() )
-  {
-    this->decreaseHealth(entity->getHealth());
+  if (entity == collider)
+    return;
+  collider = entity;
+
+  if (entity->isA(CL_PROJECTILE))
+  {
+    this->decreaseHealth(entity->getHealth() *(float)rand()/(float)RAND_MAX);
     // EXTREME HACK
-    if (this->getHealth() == 0.0f)
+    if (this->getHealth() <= 0.0f)
     {
       this->die();
@@ -157 +161 @@
   PRINTF(0)("Playable dies\n");
   // only if this is the spaceship of the player
+  if (State::isOnline())
+  {
   if( this == State::getPlayer()->getPlayable())
     State::getGameRules()->onPlayerDeath();
@@ -168 +174 @@
   this->setAbsCoor(0, 0, 0);
   this->emitter->setSystem(NULL);
+  }
 }