Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9072 in orxonox.OLD for branches/presentation/src/util


Ignore:
Timestamp:
Jul 3, 2006, 11:04:51 PM (19 years ago)
Author:
rennerc
Message:

less bugs in fragtable :D

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/presentation/src/util/multiplayer_team_deathmatch.cc

    r9068 r9072  
    541541      this->hideStats();
    542542    }
    543     if ( !this->statsBox && event.bPressed )
     543    else if ( !this->statsBox && event.bPressed )
    544544    {
    545545      PRINTF(0)("show stats\n");
     
    616616{
    617617  statsBox = new OrxGui::GLGuiBox();
    618   statsBox->setAbsCoor2D( 300, 100 );
    619 
    620   this->table = new OrxGui::GLGuiTable(5,5);
     618  statsBox->setAbsCoor2D( 100, 100 );
     619
     620  this->table = new OrxGui::GLGuiTable(10,5);
    621621
    622622  statsBox->pack( this->table );
     
    646646
    647647  std::vector<std::string> headers;
     648  headers.push_back("Blue Team");
     649  headers.push_back("");
     650  headers.push_back("");
    648651  headers.push_back("Red Team");
    649652  headers.push_back("");
    650   headers.push_back("");
    651   headers.push_back("Blue Team");
    652   headers.push_back("");
    653653  this->table->setHeader(headers);
    654654
    655   std::map<int,std::string> fragsTeam0;
    656   std::map<int,std::string> fragsTeam1;
    657 
    658   const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYER_STATS );
    659 
    660   if ( !list )
    661     return;
    662 
    663   for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
    664   {
    665     PlayerStats & stats = *dynamic_cast<PlayerStats*>(*it);
    666 
    667     if ( stats.getTeamId() == 0 || stats.getTeamId() == 1 )
    668     {
    669       if ( stats.getTeamId() == 0 )
    670         fragsTeam0[stats.getScore()] = stats.getNickName();
    671       else
    672         fragsTeam1[stats.getScore()] = stats.getNickName();
    673     }
    674   }
     655  ScoreList scoreList = PlayerStats::getScoreList();
    675656
    676657  char st[10];
    677658  int i = 0;
    678 
    679 
     659 
    680660  i = 2;
    681   for ( std::map<int,std::string>::const_iterator it = fragsTeam0.begin(); it != fragsTeam0.end(); it++ )
    682   {
    683     this->table->setEntry( 0, i, it->second );
    684     snprintf( st, 10, "%d", it->first );
    685     this->table->setEntry( 1, i, st );
    686     this->table->setEntry( 2, i, "" );
     661  for ( TeamScoreList::const_iterator it = scoreList[0].begin(); it != scoreList[0].end(); it++ )
     662  {
     663    this->table->setEntry( i, 0, it->name );
     664    snprintf( st, 10, "%d", it->score );
     665    this->table->setEntry( i, 1, st );
     666    this->table->setEntry( i, 2, "" );
    687667    i++;
    688668  }
    689669
    690670  i = 2;
    691   for ( std::map<int,std::string>::const_iterator it = fragsTeam1.begin(); it != fragsTeam1.end(); it++ )
    692   {
    693     this->table->setEntry( 3, i, it->second );
    694     snprintf( st, 10, "%d", it->first );
    695     this->table->setEntry( 4, i, st );
     671  for ( TeamScoreList::const_iterator it = scoreList[1].begin(); it != scoreList[1].end(); it++ )
     672  {
     673    this->table->setEntry( i, 3, it->name );
     674    snprintf( st, 10, "%d", it->score );
     675    this->table->setEntry( i, 4, st );
    696676    i++;
    697677  }
     678
    698679}
    699680
Note: See TracChangeset for help on using the changeset viewer.