Changeset 8802 in orxonox.OLD for trunk/src/util

Timestamp:

Jun 26, 2006, 4:46:25 PM (19 years ago)

Author:

patrick

Message:

merged the network branche back to trunk

Location:

trunk/src/util

Files:

• game_rules.cc (modified) (2 diffs)
• game_rules.h (modified) (1 diff)
• multiplayer_team_deathmatch.cc (modified) (13 diffs)
• multiplayer_team_deathmatch.h (modified) (5 diffs)

trunk/src/util/game_rules.cc

@@ -21 +21 @@
 
 #include "util/mission_goal.h"
+
+#include "shared_network_data.h"
 
 #include "debug.h"
@@ -86 +88 @@
 void GameRules::registerKill(const Kill& kill)
 {
+  if ( !SharedNetworkData::getInstance()->isGameServer() )
+    return;
   PRINTF(0)("Received Event: Kill\n");
   this->killList.push_back(kill);

trunk/src/util/game_rules.h

@@ -35 +35 @@
     /** adding a kill event to the kill list @param kill the kill object containing all infos */
     void registerKill(const Kill& kill);
+    virtual void registerSpawn( WorldEntity * we ){}
 
     virtual void onPlayerSpawn() {}
     virtual void onPlayerDeath() {}
-
 
     virtual void tick(float dt) = 0;

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -45 +45 @@
 
 #include "shell_command.h"
+
+#include "spawning_point.h"
 
 
@@ -70 +72 @@
 
   this->box = 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->table = NULL;
+  this->statsBox = NULL;
 
   this->localPlayer = State::getPlayer();
@@ -83 +82 @@
   subscribeEvent( ES_GAME, SDLK_o );
   subscribeEvent( ES_GAME, SDLK_TAB );
-
+  subscribeEvent( ES_GAME, SDLK_F1 );
+  subscribeEvent( ES_MENU, SDLK_F1 );
+  subscribeEvent( ES_MENU, KeyMapper::PEV_FIRE1 );
+  
   this->notifier = new OrxGui::GLGuiNotifier();
   this->notifier->show();
@@ -99 +101 @@
 MultiplayerTeamDeathmatch::~MultiplayerTeamDeathmatch()
 {
-  if( this->deathScreen)
-    delete this->deathScreen;
-
   unsubscribeEvent( ES_GAME, SDLK_o );
   unsubscribeEvent( ES_GAME, SDLK_TAB );
-
+  unsubscribeEvent( ES_GAME, SDLK_F1 );
+  unsubscribeEvent( ES_MENU, SDLK_F1 );
+  unsubscribeEvent( ES_MENU, KeyMapper::PEV_FIRE1 );
+  
   if ( this->notifier )
   {
@@ -130 +132 @@
       .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");
@@ -139 +138 @@
 
 
-
-void MultiplayerTeamDeathmatch::setDeathScreen(const std::string& imageName)
-{
-  if( this->deathScreen)
-    this->deathScreen->setTexture(imageName);
-}
-
-
-
-/**
- * called when the player enters the game
- * @param player the spawned player
- */
-void MultiplayerTeamDeathmatch::onPlayerSpawn()
-{
-  this->bLocalPlayerDead = false;
-  this->deathScreen->setVisibility(false);
-}
-
-
-/**
- * when the player is killed
- * @param player the killed player
- */
-void MultiplayerTeamDeathmatch::onPlayerDeath()
-{
-  this->bLocalPlayerDead = true;
-  this->deathScreen->setVisibility(true);
-}
-
-
 /**
  * time tick
@@ -176 +144 @@
 void MultiplayerTeamDeathmatch::tick(float dt)
 {
+  tickStatsTable();
   //on client side hostId is -1 until hanshake finished
   if ( SharedNetworkData::getInstance()->getHostID() < 0 )
@@ -250 +219 @@
   if ( !SharedNetworkData::getInstance()->isGameServer() )
     return;
-
+    
+  //handle kills
+  for ( std::vector<Kill>::iterator it = this->killList.begin(); it != this->killList.end();  )
+  {
+    std::vector<Kill>::iterator delit = it;
+    
+    onKill( it->getKiller()->getOwner(), it->getVictim()->getOwner() );
+    
+    it++;
+    killList.erase( delit );
+  }
+  
   gameStateTimer -= dt;
   //PRINTF(0)("TICK %f\n", gameStateTimer);
@@ -310 +290 @@
     if ( teamScore[i] >= maxKills )
     {
-      //team i wins
-      //TODO
+      nextGameState();
     }
   }
@@ -435 +414 @@
   if ( currentGameState == GAMESTATE_POST_GAME )
   {
-    //TODO end game
+    State::getCurrentStoryEntity()->stop();
+    this->bShowTeamChange = false;
 
     return;
@@ -563 +543 @@
     if ( event.bPressed )
       this->bShowTeamChange = true;
+  } else if ( event.type == SDLK_F1 )
+  {
+    if ( !this->statsBox && event.bPressed )
+    {
+      PRINTF(0)("show stats\n");
+      this->showStats();
+    }
+    if ( this->statsBox && !this->bLocalPlayerDead && event.bPressed && this->table->rowCount() != 0 && this->table->columnCount() != 0 )
+    {
+      PRINTF(0)("hide stats\n");
+      this->hideStats();
+    }
   }
   else if ( event.type == SDLK_TAB )
@@ -576 +568 @@
     }
   }
+  else if ( this->bLocalPlayerDead && statsBox && event.type == KeyMapper::PEV_FIRE1 )
+  {
+    this->hideStats();
+  }
 }
 
@@ -623 +619 @@
 }
 
-
-
-
+/**
+ * show table with frags
+ */
+void MultiplayerTeamDeathmatch::showStats( )
+{
+  EventHandler::getInstance()->pushState( ES_MENU );
+  statsBox = new OrxGui::GLGuiBox();
+  statsBox->setAbsCoor2D( 300, 100 );
+  
+  this->table = new OrxGui::GLGuiTable(0,0);
+
+  statsBox->pack( this->table );
+
+  statsBox->showAll();
+}
+
+/**
+ * hide table with frags
+ */
+void MultiplayerTeamDeathmatch::hideStats( )
+{
+    if ( statsBox )
+    {
+      delete statsBox;
+      statsBox = NULL;
+    }
+      
+    EventHandler::getInstance()->popState();
+}
+
+/**
+ * fill stats table with values
+ */
+void MultiplayerTeamDeathmatch::tickStatsTable( )
+{
+  if ( !this->statsBox )
+    return;
+
+  std::vector<std::string> headers;
+  headers.push_back("Red Team");
+  headers.push_back("");
+  headers.push_back("");
+  headers.push_back("Blue Team");
+  headers.push_back("");
+  this->table->setHeader(headers);
+  
+  std::map<int,std::string> fragsTeam0;
+  std::map<int,std::string> fragsTeam1;
+  
+  const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYER_STATS );
+  
+  if ( !list )
+    return;
+  
+  for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
+  {
+    PlayerStats & stats = *dynamic_cast<PlayerStats*>(*it);
+    
+    if ( stats.getTeamId() == 0 || stats.getTeamId() == 1 )
+    {
+      if ( stats.getTeamId() == 0 )
+        fragsTeam0[stats.getScore()] = stats.getNickName();
+      else
+        fragsTeam1[stats.getScore()] = stats.getNickName();
+    }
+  }
+  
+  char st[10];
+  int i = 0;
+  
+  
+  i = 2;
+  for ( std::map<int,std::string>::const_iterator it = fragsTeam0.begin(); it != fragsTeam0.end(); it++ )
+  {
+    this->table->setEntry( 0, i, it->second );
+    snprintf( st, 10, "%d", it->first );
+    this->table->setEntry( 1, i, st );
+    this->table->setEntry( 2, i, "" );
+    i++;
+  }
+  
+  i = 2;
+  for ( std::map<int,std::string>::const_iterator it = fragsTeam1.begin(); it != fragsTeam1.end(); it++ )
+  {
+    this->table->setEntry( 3, i, it->second );
+    snprintf( st, 10, "%d", it->first );
+    this->table->setEntry( 4, i, st );
+    i++;
+  }
+}
+
+/**
+ * this function is called when a player kills another one or himself
+ * @param killedUserId 
+ * @param userId 
+ */
+void MultiplayerTeamDeathmatch::onKill( int killedUserId, int userId )
+{
+  assert( PlayerStats::getStats( killedUserId ) );
+  assert( PlayerStats::getStats( userId ) );
+  
+  PlayerStats & killedStats = *PlayerStats::getStats( killedUserId );
+  PlayerStats & stats = *PlayerStats::getStats( userId );
+  
+  if ( killedUserId != userId )
+    stats.setScore( stats.getScore() + 1 );
+  else
+    stats.setScore( stats.getScore() - 1 );
+  
+  if ( killedUserId == SharedNetworkData::getInstance()->getHostID() )
+  {
+    this->bLocalPlayerDead = true;
+    this->showStats();
+  }
+  
+  const std::list<BaseObject*> * list = ClassList::getList( CL_SPAWNING_POINT );
+  
+  assert( list );
+  
+  std::vector<SpawningPoint*> spList;
+  
+  for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
+  {
+    SpawningPoint * sp = dynamic_cast<SpawningPoint*>(*it);
+    
+    if ( sp->getTeamId() < 0 || sp->getTeamId() == killedStats.getTeamId() )
+      spList.push_back( sp );
+  }
+ 
+  int n = spList.size()*rand();
+  
+  spList[n]->pushEntity( killedStats.getPlayable(), 3 );
+}
+
+/**
+ * this function is called on player respawn
+ * @param userId 
+ */
+void MultiplayerTeamDeathmatch::onRespawn( int userId )
+{
+  if ( userId == SharedNetworkData::getInstance()->getHostID() )
+  {
+    this->bLocalPlayerDead = false;
+    this->hideStats();
+  }
+}
+
+/**
+ * this function is called on player respawn
+ * @param we 
+ */
+void MultiplayerTeamDeathmatch::registerSpawn( WorldEntity * we )
+{
+  onRespawn( we->getOwner() );
+}
+

trunk/src/util/multiplayer_team_deathmatch.h

@@ -41 +41 @@
     virtual std::string getPlayableModelFileName( int userId, int team, ClassID classId );
 
-    virtual void onPlayerSpawn();
-    virtual void onPlayerDeath();
-
+    virtual void registerSpawn( WorldEntity * we );
 
     virtual void tick(float dt);
@@ -50 +48 @@
     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; }
@@ -58 +55 @@
     
     virtual void process(const Event &event);
+    
+    void onKill( int killedUserId, int userId );
+    void onRespawn( int userId );
     
     virtual void handleChatMessage( int userId, const std::string & message, int messageType );
@@ -73 +73 @@
 
     std::map<int,int>  teamScore;                  //!< team score
-
-    ImagePlane*        deathScreen;                //!< the death screen
 
     int                currentGameState;           //!< game state
@@ -100 +98 @@
     
     void onInputEnter( const std::string & text );
+    
+    OrxGui::GLGuiBox* statsBox;
+    OrxGui::GLGuiTable* table;
+    void tickStatsTable();
+    
+    void showStats();
+    void hideStats();
 };