← Back to branch summary

~armagetronad-ct/armagetronad/0.4-advrim

« back to all changes in this revision

Viewing changes to src/engine/eTeam.cpp

  • Committer: Voodoo
  • Date: 2013-04-11 10:46:24 UTC
  • Revision ID: voodoo-20130411104624-zse1f33o7ten188z
merge -r 1454..1476 lp:armagetronad/0.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/engine/eTeam.cpp
210
210
    for ( i = players.Len()-1; i>=0; --i )
211
211
    {
212
212
        ePlayerNetID * player = players(i);
213
 
 
214
 
        // on the client, don't count players who already expressed their wish
215
 
        // to leave a team as active players.
216
 
        if ( sn_GetNetState() != nCLIENT || player->nextTeam == this )
 
213
        if ( player->IsHuman() )
217
214
        {
218
 
            if ( player->IsHuman() )
219
 
            {
220
 
                if ( player->IsActive() )
221
 
                    ++numHumans;
222
 
            }
223
 
            else
224
 
                ++numAIs;
 
215
            if ( player->IsActive() )
 
216
                ++numHumans;
225
217
        }
 
218
        else
 
219
            ++numAIs;
226
220
    }
227
221
 
228
222
    if ( nSERVER == sn_GetNetState() )
363
357
        }
364
358
        else if( !lastEmpty_ )
365
359
        {
 
360
            LogScoreDifference();
366
361
            se_teamDestroyWriter << logName;
367
362
            se_teamDestroyWriter.write();
368
363
        }
633
628
 
634
629
void eTeam::LogScoreDifference( void )
635
630
{
 
631
    LogScoreDifference( logName );
 
632
}
 
633
 
 
634
void eTeam::LogScoreDifference( const tString & teamName )
 
635
{
636
636
    if ( lastScore_ > IMPOSSIBLY_LOW_SCORE && IsHuman() )
637
637
    {
638
638
        tString ret;
639
639
        int scoreDifference = score - lastScore_;
640
640
        lastScore_ = IMPOSSIBLY_LOW_SCORE;
641
 
        se_roundScoreTeamWriter << scoreDifference << logName;
 
641
        se_roundScoreTeamWriter << scoreDifference << teamName;
642
642
        se_roundScoreTeamWriter.write();
643
643
    }
644
644
}