Changeset 8838 in orxonox.OLD for branches/multi_player_map/src/util

Timestamp:

Jun 28, 2006, 12:44:07 AM (19 years ago)

Author:

patrick

Message:

mulitplayer: debuggin session

File:

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

branches/multi_player_map/src/util/multiplayer_team_deathmatch.cc

@@ -85 +85 @@
   subscribeEvent( ES_MENU, SDLK_F1 );
   subscribeEvent( ES_MENU, KeyMapper::PEV_FIRE1 );
-  
+
   this->notifier = new OrxGui::GLGuiNotifier();
   this->notifier->show();
@@ -106 +106 @@
   unsubscribeEvent( ES_MENU, SDLK_F1 );
   unsubscribeEvent( ES_MENU, KeyMapper::PEV_FIRE1 );
-  
+
   if ( this->notifier )
   {
@@ -219 +219 @@
   if ( !SharedNetworkData::getInstance()->isGameServer() )
     return;
-    
+
   //handle kills
   for ( std::vector<Kill>::iterator it = this->killList.begin(); it != this->killList.end();  )
   {
     std::vector<Kill>::iterator delit = it;
-    
+
     onKill( it->getKiller()->getOwner(), it->getVictim()->getOwner() );
-    
+
     it++;
     killList.erase( delit );
   }
-  
+
   gameStateTimer -= dt;
   //PRINTF(0)("TICK %f\n", gameStateTimer);
@@ -482 +482 @@
   playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
   playable.setSynchronized( true );
-  
+
   stats.setTeamId( stats.getPreferedTeamId() );
   stats.setPlayableClassId( playableClassId );
   stats.setPlayableUniqueId( playable.getUniqueID() );
   stats.setModelFileName( playableModel );
-  
+
   this->respawnPlayable( &playable, stats.getPreferedTeamId(), 0.0f );
 
@@ -629 +629 @@
   statsBox = new OrxGui::GLGuiBox();
   statsBox->setAbsCoor2D( 300, 100 );
-  
+
   this->table = new OrxGui::GLGuiTable(0,0);
 
@@ -647 +647 @@
       statsBox = NULL;
     }
-      
+
     EventHandler::getInstance()->popState();
 }
@@ -666 +666 @@
   headers.push_back("");
   this->table->setHeader(headers);
-  
+
   std::map<int,std::string> fragsTeam0;
   std::map<int,std::string> fragsTeam1;
-  
+
   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++ )
   {
     PlayerStats & stats = *dynamic_cast<PlayerStats*>(*it);
-    
+
     if ( stats.getTeamId() == 0 || stats.getTeamId() == 1 )
     {
@@ -687 +687 @@
     }
   }
-  
+
   char st[10];
   int i = 0;
-  
-  
+
+
   i = 2;
   for ( std::map<int,std::string>::const_iterator it = fragsTeam0.begin(); it != fragsTeam0.end(); it++ )
@@ -701 +701 @@
     i++;
   }
-  
+
   i = 2;
   for ( std::map<int,std::string>::const_iterator it = fragsTeam1.begin(); it != fragsTeam1.end(); it++ )
@@ -714 +714 @@
 /**
  * this function is called when a player kills another one or himself
- * @param killedUserId 
- * @param userId 
+ * @param killedUserId
+ * @param userId
  */
 void MultiplayerTeamDeathmatch::onKill( int killedUserId, int userId )
@@ -721 +721 @@
   assert( PlayerStats::getStats( killedUserId ) );
   assert( PlayerStats::getStats( userId ) );
-  
+
   PlayerStats & killedStats = *PlayerStats::getStats( killedUserId );
   PlayerStats & stats = *PlayerStats::getStats( userId );
-  
+
   if ( killedUserId != userId )
     stats.setScore( stats.getScore() + 1 );
   else
     stats.setScore( stats.getScore() - 1 );
-  
+
   if ( killedUserId == SharedNetworkData::getInstance()->getHostID() )
   {
@@ -735 +735 @@
     this->showStats();
   }
-  
+
   this->respawnPlayable( killedStats.getPlayable(), killedStats.getTeamId(), 3.0f );
 }
@@ -741 +741 @@
 /**
  * this function is called on player respawn
- * @param userId 
+ * @param userId
  */
 void MultiplayerTeamDeathmatch::onRespawn( int userId )
@@ -754 +754 @@
 /**
  * this function is called on player respawn
- * @param we 
+ * @param we
  */
 void MultiplayerTeamDeathmatch::registerSpawn( WorldEntity * we )
@@ -761 +761 @@
 }
 
+
 void MultiplayerTeamDeathmatch::respawnPlayable( Playable * playable, int teamId, float delay )
 {
   const std::list<BaseObject*> * list = ClassList::getList( CL_SPAWNING_POINT );
-  
+
   assert( list );
-  
+
   std::vector<SpawningPoint*> spList;
-  
+
   for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
   {
     SpawningPoint * sp = dynamic_cast<SpawningPoint*>(*it);
-    
+
     if ( sp->getTeamId() == teamId )
       spList.push_back( sp );
   }
-  
+
   if ( spList.size() == 0 )
   {
@@ -782 +783 @@
     {
       SpawningPoint * sp = dynamic_cast<SpawningPoint*>(*it);
-    
+
       if ( sp->getTeamId() < 0 )
         spList.push_back( sp );
     }
   }
-  
+
   assert( spList.size() != 0 );
- 
+
   int n = (int)((float)spList.size() * (float)rand()/(float)RAND_MAX);
-  
+
   spList[n]->pushEntity( playable, delay );
 }