~swag/armagetronad/0.2.9-sty+ct+ap-fork

Viewing changes to src/engine/ePlayer.cpp

Committer: bazaarmagetron
Date: 2009-09-10 22:23:35 UTC
mto: (563.27.1 armagetronad)
mto: This revision was merged to the branch mainline in revision 688.
Revision ID: svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Fbranches%2F0.2.8%2Farmagetronad:9256

Automatic merging of commits that would change history order:
------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.

Show diffs side-by-side

added added

removed removed

src/engine/ePlayer.cpp

5013

5014

GetScoreFromDisconnectedCopy();

5015

5016

// force name update

5017

UpdateName();

5016

// force update (removed again to fix name change possibility during a round)

5017

// UpdateName();

5018

}

5019

5020

void ePlayerNetID::DeAuthenticate( ePlayerNetID const * admin ){

5035

5036

rawAuthenticatedName_ = "";

5037

5038

// force update

5039

UpdateName();

5038

// force update (removed again to fix name change possibility during a round)

5039

// UpdateName();

5040

}

5041

5042

bool ePlayerNetID::IsAuthenticated() const

8299

{

8300

sn_ConsoleOut( tOutput( "$player_suspended", GetColoredName(), suspended ) );

8301

SetTeam( NULL );

8302

if ( Object() && Object()->Alive() )

8303

Object()->Kill();

8302

8304

}

8303

8305

}

8304

8306

8344

8346

}

8345

8347

}

8346

8348

8349

void ePlayerNetID::UpdateShuffleSpamTesters()

8350

{

8351

for ( int i = se_PlayerNetIDs.Len()-1; i>=0; --i )

8352

{

8353

ePlayerNetID *p = se_PlayerNetIDs( i );

8354

p->shuffleSpam.Reset();

8355

}

8356

}

8357

8347

8358

// *******************************************************************************

8348

8359

// *

8349

8360

// * LogScoreDifference

Older »