Changeset 8774 in orxonox.OLD for branches

Timestamp:

Jun 25, 2006, 11:14:09 AM (18 years ago)

Author:

rennerc

Message:

frag table can be hidden with f1 now

File:

• branches/network/src/util/multiplayer_team_deathmatch.cc (modified) (6 diffs)

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -81 +81 @@
   subscribeEvent( ES_GAME, SDLK_TAB );
   subscribeEvent( ES_GAME, SDLK_F1 );
+  subscribeEvent( ES_MENU, SDLK_F1 );
   subscribeEvent( ES_MENU, KeyMapper::PEV_FIRE1 );
   
@@ -101 +102 @@
   unsubscribeEvent( ES_GAME, SDLK_TAB );
   unsubscribeEvent( ES_GAME, SDLK_F1 );
+  unsubscribeEvent( ES_MENU, SDLK_F1 );
   unsubscribeEvent( ES_MENU, KeyMapper::PEV_FIRE1 );
   
@@ -550 +552 @@
   } else if ( event.type == SDLK_F1 )
   {
-    if ( event.bPressed )
+    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 )
@@ -565 +575 @@
     }
   }
-  else if ( statsBox && event.type == KeyMapper::PEV_FIRE1 )
+  else if ( this->bLocalPlayerDead && statsBox && event.type == KeyMapper::PEV_FIRE1 )
   {
     this->hideStats();
@@ -625 +635 @@
   statsBox->setAbsCoor2D( 300, 100 );
   
-  this->table = new OrxGui::GLGuiTable(4, 4);
+  this->table = new OrxGui::GLGuiTable(0,0);
 
   statsBox->pack( this->table );
-  
-  statsBox->setAbsCoor2D(50, 200);
-  
+
   statsBox->showAll();
 }
@@ -676 +684 @@
     PlayerStats & stats = *dynamic_cast<PlayerStats*>(*it);
     
-    assert( stats.getTeamId() == 0 || stats.getTeamId() == 1 );
-    if ( stats.getTeamId() == 0 )
-      fragsTeam0[stats.getScore()] = stats.getNickName();
-    else
-      fragsTeam1[stats.getScore()] = stats.getNickName();
+    if ( stats.getTeamId() == 0 || stats.getTeamId() == 1 )
+    {
+      if ( stats.getTeamId() == 0 )
+        fragsTeam0[stats.getScore()] = stats.getNickName();
+      else
+        fragsTeam1[stats.getScore()] = stats.getNickName();
+    }
   }