Changeset 9049 in orxonox.OLD

Timestamp:

Jul 3, 2006, 5:04:47 PM (18 years ago)

Author:

rennerc

Message:

table doesnt segfault anymore

File:

• branches/multi_player_map/src/util/multiplayer_team_deathmatch.cc (modified) (5 diffs)

branches/multi_player_map/src/util/multiplayer_team_deathmatch.cc

@@ -83 +83 @@
   subscribeEvent( ES_GAME, SDLK_TAB );
   subscribeEvent( ES_GAME, SDLK_F1 );
-  subscribeEvent( ES_MENU, SDLK_F1 );
   subscribeEvent( ES_MENU, KeyMapper::PEV_FIRE1 );
 
@@ -99 +98 @@
   unsubscribeEvent( ES_GAME, SDLK_TAB );
   unsubscribeEvent( ES_GAME, SDLK_F1 );
-  unsubscribeEvent( ES_MENU, SDLK_F1 );
   unsubscribeEvent( ES_MENU, KeyMapper::PEV_FIRE1 );
 
@@ -534 +532 @@
   } else if ( event.type == SDLK_F1 )
   {
+    if ( this->statsBox && !this->bLocalPlayerDead && event.bPressed )
+    {
+      PRINTF(0)("hide stats\n");
+      this->hideStats();
+    }
     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();
     }
   }
@@ -613 +611 @@
 void MultiplayerTeamDeathmatch::showStats( )
 {
-  EventHandler::getInstance()->pushState( ES_MENU );
   statsBox = new OrxGui::GLGuiBox();
   statsBox->setAbsCoor2D( 300, 100 );
 
-  this->table = new OrxGui::GLGuiTable(0,0);
+  this->table = new OrxGui::GLGuiTable(5,5);
 
   statsBox->pack( this->table );
@@ -634 +631 @@
       statsBox = NULL;
     }
-
-    EventHandler::getInstance()->popState();
 }