Changeset 7079 in orxonox.OLD for trunk/src

Timestamp:

Feb 7, 2006, 4:18:20 PM (19 years ago)

Author:

patrick

Message:

trunk: minor game rules change

Location:

trunk/src

Files:

• util/multiplayer_team_deathmatch.cc (modified) (2 diffs)
• world_entities/playable.cc (modified) (2 diffs)

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -125 +125 @@
   {
     this->timeout += dt;
-
+    PRINTF(0)("TICK DEATH\n");
     // long enough dead?
     if( this->timeout >= this->deathTimeout)
@@ -131 +131 @@
       this->timeout = 0.0f;
       // respawn
+      PRINTF(0)("RESPAWN\n");
       (State::getPlayer())->getPlayable()->respawn();
     }

trunk/src/world_entities/playable.cc

@@ -167 +167 @@
 
 
-    this->toList(OM_DEAD);
+    this->toList(OM_DEAD_TICK);
   //HACK: moves the entity to an unknown place far far away: in the future, GameRules will look for that
     this->setAbsCoor(-2000.0, -2000.0, -2000.0);
@@ -173 +173 @@
   //explosion hack
     this->emitter->setSystem(explosionParticles);
-    this->setAbsCoor(0, 0, 0);
     this->emitter->setSystem(NULL);
   }