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

Timestamp:

Jun 22, 2006, 2:04:28 PM (19 years ago)

Author:

bensch

Message:

merged the gui back

File:

• trunk/src/util/multiplayer_team_deathmatch.cc (modified) (22 diffs)

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -68 +68 @@
   this->gameStateTimer = 10.0f;
   this->bShowTeamChange = false;
-  
+
   this->box = NULL;
 
@@ -80 +80 @@
   if( root != NULL)
     this->loadParams(root);
-  
+
   subscribeEvent( ES_GAME, SDLK_o );
   subscribeEvent( ES_GAME, SDLK_TAB );
-  
+
   this->notifier = new OrxGui::GLGuiNotifier();
   this->notifier->show();
@@ -101 +101 @@
   if( this->deathScreen)
     delete this->deathScreen;
-  
+
   unsubscribeEvent( ES_GAME, SDLK_o );
   unsubscribeEvent( ES_GAME, SDLK_TAB );
-  
+
   if ( this->notifier )
   {
@@ -110 +110 @@
     this->notifier = NULL;
   }
-  
+
   if ( this->input )
   {
@@ -132 +132 @@
   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");
@@ -179 +179 @@
   if ( SharedNetworkData::getInstance()->getHostID() < 0 )
     return;
-  
+
   if ( currentGameState == GAMESTATE_PRE_GAME || currentGameState == GAMESTATE_GAME )
   {
     if ( PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )
          && box == NULL
-         &&  (PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )->getPreferedTeamId() == TEAM_NOTEAM 
+         &&  (PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )->getPreferedTeamId() == TEAM_NOTEAM
          || bShowTeamChange )
-         
+
        )
     {
       EventHandler::getInstance()->pushState( ES_MENU );
-      
+
       OrxGui::GLGuiHandler::getInstance()->activateCursor();
-      
+
       box = new OrxGui::GLGuiBox();
       box->setAbsCoor2D( 300, 100 );
-      
+
       OrxGui::GLGuiPushButton * buttonSpectator = new OrxGui::GLGuiPushButton("Spectator");
       box->pack( buttonSpectator );
       buttonSpectator->connect(SIGNAL(buttonSpectator, released), this, SLOT(MultiplayerTeamDeathmatch, onButtonSpectator));
-      
+
       OrxGui::GLGuiPushButton * buttonRandom = new OrxGui::GLGuiPushButton("Random");
       box->pack( buttonRandom );
       buttonRandom->connect(SIGNAL(buttonRandom, released), this, SLOT(MultiplayerTeamDeathmatch, onButtonRandom));
-      
+
       OrxGui::GLGuiPushButton * buttonTeam0 = new OrxGui::GLGuiPushButton("Blue Team");
       box->pack( buttonTeam0 );
       buttonTeam0->connect(SIGNAL(buttonTeam0, released), this, SLOT(MultiplayerTeamDeathmatch, onButtonTeam0));
-      
+
       OrxGui::GLGuiPushButton * buttonTeam1 = new OrxGui::GLGuiPushButton("Red Team");
       box->pack( buttonTeam1 );
       buttonTeam1->connect(SIGNAL(buttonTeam1, released), this, SLOT(MultiplayerTeamDeathmatch, onButtonTeam1));
-      
+
       if ( bShowTeamChange )
       {
@@ -218 +218 @@
         buttonCancel->connect(SIGNAL(buttonCancel, released), this, SLOT(MultiplayerTeamDeathmatch, onButtonCancel));
       }
-      
+
       OrxGui::GLGuiPushButton * buttonExit = new OrxGui::GLGuiPushButton("Exit");
       box->pack( buttonExit );
       buttonExit->connect(SIGNAL(buttonExit, released), this, SLOT(MultiplayerTeamDeathmatch, onButtonExit));
-      
+
       box->showAll();
     }
@@ -229 +229 @@
   if ( box != NULL
        && PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )
-       && PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )->getPreferedTeamId() != TEAM_NOTEAM 
+       && PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )->getPreferedTeamId() != TEAM_NOTEAM
        && !bShowTeamChange
      )
@@ -235 +235 @@
     delete box;
     box = NULL;
-      
+
     OrxGui::GLGuiHandler::getInstance()->deactivateCursor( true );
-      
+
     EventHandler::getInstance()->popState();
   }
-  
+
   if ( box != NULL )
   {
     OrxGui::GLGuiHandler::getInstance()->tick( dt );
   }
-  
+
   assignPlayable();
-  
+
   if ( !SharedNetworkData::getInstance()->isGameServer() )
     return;
-  
+
   gameStateTimer -= dt;
   //PRINTF(0)("TICK %f\n", gameStateTimer);
-  
+
   if ( currentGameState != GAMESTATE_GAME && gameStateTimer < 0 )
     nextGameState();
-  
+
   this->currentGameState = NetworkGameManager::getInstance()->getGameState();
-  
+
   if ( currentGameState == GAMESTATE_GAME )
   {
     handleTeamChanges();
   }
-  
+
   this->calculateTeamScore();
-  
+
   this->checkGameRules();
 
@@ -304 +304 @@
   if ( !SharedNetworkData::getInstance()->isGameServer() )
     return;
-  
+
   // check for max killing count
   for ( int i = 0; i<numTeams; i++ )
@@ -329 +329 @@
   if ( team == TEAM_NOTEAM || team == TEAM_SPECTATOR )
     return CL_SPECTATOR;
-  
+
   if ( team == 0 || team == 1 )
     return CL_SPACE_SHIP;
-  
+
   assert( false );
 }
@@ -352 +352 @@
 {
   teamScore.clear();
-  
+
   for ( int i = 0; i<numTeams; i++ )
     teamScore[i] = 0;
-  
-    
+
+
   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++ )
   {
@@ -380 +380 @@
 {
   std::map<int,int> playersInTeam;
-  
+
   for ( int i = 0; i<numTeams; i++ )
     playersInTeam[i] = 0;
-  
+
   const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYER_STATS );
-  
+
   if ( !list )
     return 0;
-  
+
   for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
   {
@@ -398 +398 @@
     }
   }
-  
-  
+
+
   int minPlayers = 0xFFFF;
   int minTeam = -1;
-  
+
   for ( int i = 0; i<numTeams; i++ )
   {
@@ -411 +411 @@
     }
   }
-  
+
   assert( minTeam != -1 );
-  
+
   return minTeam;
 }
@@ -422 +422 @@
   {
     NetworkGameManager::getInstance()->setGameState( GAMESTATE_GAME );
-    
-    return;
-  }
-  
+
+    return;
+  }
+
   if ( currentGameState == GAMESTATE_GAME )
   {
     NetworkGameManager::getInstance()->setGameState( GAMESTATE_POST_GAME );
-    
-    return;
-  }
-  
+
+    return;
+  }
+
   if ( currentGameState == GAMESTATE_POST_GAME )
   {
     //TODO end game
-    
+
     return;
   }
@@ -444 +444 @@
 {
   const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYER_STATS );
-  
+
   if ( !list )
     return;
-  
+
   //first server players with choices
   for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
@@ -461 +461 @@
     }
   }
-  
+
   //now serve player who want join a random team
   for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
@@ -482 +482 @@
   assert( PlayerStats::getStats( userId ) );
   PlayerStats & stats = *(PlayerStats::getStats( userId ));
-  
+
   stats.setTeamId( stats.getPreferedTeamId() );
-  
+
   Playable * oldPlayable = stats.getPlayable();
-  
-  
+
+
   ClassID playableClassId = getPlayableClassId( userId, stats.getPreferedTeamId() );
   std::string playableModel = getPlayableModelFileName( userId, stats.getPreferedTeamId(), playableClassId );
-  
+
   BaseObject * bo = Factory::fabricate( playableClassId );
-  
+
   assert( bo != NULL );
   assert( bo->isA( CL_PLAYABLE ) );
-  
+
   Playable & playable = *(dynamic_cast<Playable*>(bo));
-  
+
   playable.loadModel( playableModel );
   playable.setOwner( userId );
   playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
   playable.setSynchronized( true );
-  
+
   stats.setTeamId( stats.getPreferedTeamId() );
   stats.setPlayableClassId( playableClassId );
   stats.setPlayableUniqueId( playable.getUniqueID() );
   stats.setModelFileName( playableModel );
-  
+
   if ( oldPlayable )
   {
@@ -572 +572 @@
       OrxGui::GLGuiHandler::getInstance()->deactivateCursor();
       input->show();
-      input->giveFocus();
+      input->giveMouseFocus();
       input->setText("say ");
     }
@@ -594 +594 @@
 {
   std::string name = "unknown";
-  
+
   if ( PlayerStats::getStats( userId ) )
   {
     name = PlayerStats::getStats( userId )->getNickName();
   }
-  
+
   PRINTF(0)("CHATMESSAGE %s (%d): %s\n", name.c_str(), userId, message.c_str() );
   notifier->pushNotifyMessage(name + ": " + message);
@@ -607 +607 @@
 {
   EventHandler::getInstance()->popState();
-  input->breakFocus();
+  input->breakMouseFocus();
   input->hide();
   input->setText("");
 
   std::string command = text;
- 
+
   //HACK insert " in say commands so user doesn't have to type them
   if ( command.length() >= 4 && command[0] == 's' && command[1] == 'a' && command[2] == 'y' && command[3] == ' ' )