Changeset 8772 in orxonox.OLD

Timestamp:

Jun 25, 2006, 10:26:54 AM (18 years ago)

Author:

rennerc

Message:

removed old deathScreen from MultiplayerTeamDeathmatch

Location:

branches/network/src/util

Files:

• multiplayer_team_deathmatch.cc (modified) (6 diffs)
• multiplayer_team_deathmatch.h (modified) (2 diffs)

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -72 +72 @@
   this->table = NULL;
   this->statsBox = NULL;
-
-  this->deathScreen = new ImagePlane();
-  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->localPlayer = State::getPlayer();
@@ -103 +98 @@
 MultiplayerTeamDeathmatch::~MultiplayerTeamDeathmatch()
 {
-  if( this->deathScreen)
-    delete this->deathScreen;
-  
   unsubscribeEvent( ES_GAME, SDLK_o );
   unsubscribeEvent( ES_GAME, SDLK_TAB );
@@ -136 +128 @@
       .describe("sets the maximal kills for winning condition");
 
-  LoadParam(root, "death-screen-image", this, MultiplayerTeamDeathmatch, setDeathScreen)
-      .describe("sets the death screen image");
-  
   LoadParam(root, "num-teams", this, MultiplayerTeamDeathmatch, setNumTeams)
       .describe("sets number of teams");
@@ -145 +134 @@
 
 
-
-void MultiplayerTeamDeathmatch::setDeathScreen(const std::string& imageName)
-{
-  if( this->deathScreen)
-    this->deathScreen->setTexture(imageName);
-}
-
-
-
 /**
  * called when the player enters the game
@@ -161 +141 @@
 {
   this->bLocalPlayerDead = false;
-  this->deathScreen->setVisibility(false);
 }
 
@@ -172 +151 @@
 {
   this->bLocalPlayerDead = true;
-  this->deathScreen->setVisibility(true);
 }
 

branches/network/src/util/multiplayer_team_deathmatch.h

@@ -50 +50 @@
     inline void setDeathPenaltyTimeout(float time) { this->deathTimeout = time; }
     inline void setMaxKills(int kills) { this->maxKills = kills; }
-    void setDeathScreen(const std::string& imageName);
     
     inline void setNumTeams( int numTeams ){ this->numTeams = numTeams; }
@@ -73 +72 @@
 
     std::map<int,int>  teamScore;                  //!< team score
-
-    ImagePlane*        deathScreen;                //!< the death screen
 
     int                currentGameState;           //!< game state