Changeset 7044 in orxonox.OLD

Timestamp:

Feb 6, 2006, 2:09:01 AM (18 years ago)

Author:

patrick

Message:

trunk: death screen now works

Location:

trunk/src

Files:

• util/game_rules.h (modified) (1 diff)
• util/multiplayer_team_deathmatch.cc (modified) (6 diffs)
• util/multiplayer_team_deathmatch.h (modified) (1 diff)
• world_entities/playable.cc (modified) (3 diffs)
• world_entities/playable.h (modified) (1 diff)

trunk/src/util/game_rules.h

@@ -26 +26 @@
 
 
-    virtual void onPlayerSpawn(Player* player) {}
-    virtual void onPlayerDeath(Player* player) {}
+    virtual void onPlayerSpawn() {}
+    virtual void onPlayerDeath() {}
 
 

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -23 +23 @@
 #include "state.h"
 
+#include "player.h"
+#include "playable.h"
+
 
 using namespace std;
@@ -42 +45 @@
 
   this->deathScreen = new Billboard();
-  this->deathScreen->setSize(State::getResX(), State::getResY());
+  this->deathScreen->setSize(State::getResX()/4.0, State::getResY()/4.0);
   this->deathScreen->setAbsCoor2D(State::getResX()/2.0f, State::getResY()/2.0f);
-  //this->deathScreen->setVisibility(false);
+  this->deathScreen->setVisibility(false);
+
+  this->localPlayer = State::getPlayer();
 
   if( root != NULL)
@@ -54 +59 @@
  */
 MultiplayerTeamDeathmatch::~MultiplayerTeamDeathmatch()
-{}
+{
+  if( this->deathScreen)
+    delete this->deathScreen;
+}
 
 
@@ -87 +95 @@
  * @param player the spawned player
  */
-void MultiplayerTeamDeathmatch::onPlayerSpawn(Player* player)
+void MultiplayerTeamDeathmatch::onPlayerSpawn()
 {
-  this->bLocalPlayerDead = true;
+  this->bLocalPlayerDead = false;
+  this->deathScreen->setVisibility(false);
 }
 
@@ -97 +106 @@
  * @param player the killed player
  */
-void MultiplayerTeamDeathmatch::onPlayerDeath(Player* player)
+void MultiplayerTeamDeathmatch::onPlayerDeath()
 {
-  this->localPlayer = player;
   this->bLocalPlayerDead = true;
+  this->deathScreen->setVisibility(true);
 }
 
@@ -118 +127 @@
 
     // long enough dead?
-    if( dt >= this->deathTimeout)
+    if( this->timeout >= this->deathTimeout)
     {
       this->timeout = 0.0f;
-
       // respawn
+      (State::getPlayer())->getPlayable()->respawn();
     }
   }

trunk/src/util/multiplayer_team_deathmatch.h

@@ -29 +29 @@
 
 
-    virtual void onPlayerSpawn(Player* player);
-    virtual void onPlayerDeath(Player* player);
+    virtual void onPlayerSpawn();
+    virtual void onPlayerDeath();
 
 

trunk/src/world_entities/playable.cc

@@ -27 +27 @@
 #include "power_ups/param_power_up.h"
 
+#include "game_rules.h"
 
 #include "dot_emitter.h"
@@ -136 +137 @@
 
 
-void Playable::die()
-{
-    //this->deactivateNode();
-  this->toList(OM_DEAD);
-  this->emitter->setSystem(explosionParticles);
-  this->setAbsCoor(0, 0, 0);
-    //this->setAbsDir(Vector(1,0,0), 0);
-  this->emitter->setSystem(NULL);
-
+void Playable::respawn()
+{
+  PRINTF(0)("Playable respawn\n");
+  // only if this is the spaceship of the player
+  if( this == State::getPlayer()->getPlayable())
+    State::getGameRules()->onPlayerSpawn();
+
+  this->setAbsCoor(0.0, 0.0, 0.0);
 
   if( this->getOwner()%2 == 0)
@@ -150 +150 @@
   else
     this->toList(OM_GROUP_01);
+}
+
+
+void Playable::die()
+{
+  PRINTF(0)("Playable dies\n");
+  // only if this is the spaceship of the player
+  if( this == State::getPlayer()->getPlayable())
+    State::getGameRules()->onPlayerDeath();
+
+  this->toList(OM_DEAD);
+  //.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);
+
+  //explosion hack
+  this->emitter->setSystem(explosionParticles);
+  this->setAbsCoor(0, 0, 0);
+  this->emitter->setSystem(NULL);
 }
 

trunk/src/world_entities/playable.h

@@ -30 +30 @@
 
     virtual void die();
+    virtual void respawn();
 
     virtual bool pickup(PowerUp* powerUp);