Changeset 8851 in orxonox.OLD

Timestamp:

Jun 28, 2006, 2:06:10 PM (18 years ago)

Author:

rennerc

Message:

chat window is on TAB again

File:

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

branches/multi_player_map/src/util/multiplayer_team_deathmatch.cc

@@ -81 +81 @@
 
   subscribeEvent( ES_GAME, SDLK_o );
-  subscribeEvent( ES_GAME, SDLK_t );
+  subscribeEvent( ES_GAME, SDLK_TAB );
   subscribeEvent( ES_GAME, SDLK_F1 );
   subscribeEvent( ES_MENU, SDLK_F1 );
@@ -102 +102 @@
 {
   unsubscribeEvent( ES_GAME, SDLK_o );
-  unsubscribeEvent( ES_GAME, SDLK_t );
+  unsubscribeEvent( ES_GAME, SDLK_TAB );
   unsubscribeEvent( ES_GAME, SDLK_F1 );
   unsubscribeEvent( ES_MENU, SDLK_F1 );
@@ -558 +558 @@
     }
   }
-  else if ( event.type == SDLK_t )
-  {
-    if ( !event.bPressed )
+  else if ( event.type == SDLK_TAB )
+  {
+    if ( currentGameState == GAMESTATE_GAME && !event.bPressed && !EventHandler::getInstance()->isPressed( SDLK_RALT ) && !EventHandler::getInstance()->isPressed( SDLK_LALT ) )
     {
       EventHandler::getInstance()->pushState( ES_MENU );