Changeset 8739 in orxonox.OLD

Timestamp:

Jun 23, 2006, 10:59:35 AM (18 years ago)

Author:

rennerc

Message:

showing/hiding frags works now

Location:

branches/network/src/util

Files:

• multiplayer_team_deathmatch.cc (modified) (7 diffs)
• multiplayer_team_deathmatch.h (modified) (1 diff)

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -70 +70 @@
   
   this->box = NULL;
+  this->table = NULL;
+  this->statsBox = NULL;
 
   this->deathScreen = new ImagePlane();
@@ -84 +86 @@
   subscribeEvent( ES_GAME, SDLK_TAB );
   subscribeEvent( ES_GAME, SDLK_F1 );
+  subscribeEvent( ES_MENU, KeyMapper::PEV_FIRE1 );
   
   this->notifier = new OrxGui::GLGuiNotifier();
@@ -106 +109 @@
   unsubscribeEvent( ES_GAME, SDLK_TAB );
   unsubscribeEvent( ES_GAME, SDLK_F1 );
+  unsubscribeEvent( ES_MENU, KeyMapper::PEV_FIRE1 );
   
   if ( this->notifier )
@@ -178 +182 @@
 void MultiplayerTeamDeathmatch::tick(float dt)
 {
+  tickStatsTable();
   //on client side hostId is -1 until hanshake finished
   if ( SharedNetworkData::getInstance()->getHostID() < 0 )
@@ -582 +587 @@
     }
   }
+  else if ( statsBox && event.type == KeyMapper::PEV_FIRE1 )
+  {
+    this->hideStats();
+  }
 }
 
@@ -638 +647 @@
   statsBox->setAbsCoor2D( 300, 100 );
   
-  OrxGui::GLGuiTable * table = new OrxGui::GLGuiTable( 4, 4 );
-  
-  statsBox->pack( table );
-  
-  //table->setColumnWidth( 0, 500.0f );
-  //table->setColumnWidth( 1, 500.0f );
-  
-  //table->setRowHeight( 0, 500 );
-  
-  table->setEntry( 0, 1, "Red Team" );
-  table->setEntry( 1, 1, "Blue Team" );
-  
-  //table->setRowHeight( 1, 500 );
-  //table->setRowHeight( 2, 500 );
-  
-  //table->setEntry( 0, 2, "Johan Vogel" );
-  //table->setEntry( 1, 2, "Koebi Kuhn" );
+  this->table = new OrxGui::GLGuiTable(4, 4);
+
+  statsBox->pack( this->table );
+  
+  statsBox->setAbsCoor2D(50, 200);
   
   statsBox->showAll();
@@ -664 +661 @@
 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("Blue Team");
+  headers.push_back("");
+  this->table->setHeader(headers);
+  
+  this->table->setEntry( 0, 1, "Alain Sutter" );
+  this->table->setEntry( 1, 1, "0" );
+  this->table->setEntry( 2, 1, "Koebi Kuhn" );
+  this->table->setEntry( 3, 1, "3" );
+}
+
+
+
+

branches/network/src/util/multiplayer_team_deathmatch.h

@@ -102 +102 @@
     
     OrxGui::GLGuiBox* statsBox;
+    OrxGui::GLGuiTable* table;
+    void tickStatsTable();
     
     void showStats();