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

« back to all changes in this revision

Viewing changes to src/engine/eTeam.cpp

Committer: kyle
Date: 2011-07-20 17:52:45 UTC
mfrom: (563.20.34 0.2.8-armagetronad-sty)
Revision ID: racingmasterweb@gmail.com-20110720175245-8coqtsgb86qbfjwv

merge with mainline

files modified:
NEWS

batch/make/uninstall

config/settings.cfg

configure.ac

language/english_base.txt

src/engine/eCoord.h

src/engine/eGameObject.h

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eTeam.cpp

src/engine/eVoter.cpp

src/network/nKrawallPrivate.cpp

src/network/nNetObject.h

src/network/nNetwork.cpp

src/network/nNetwork.h

src/network/nPriorizing.cpp

src/network/nPriorizing.h

src/network/nServerInfo.h

src/render/rModel.h

src/tools/tArray.h

src/tools/tConfiguration.h

src/tools/tDirectories.cpp

src/tools/tDirectories.h

src/tools/tHeap.h

src/tools/tLinkedList.h

src/tools/tList.h

src/tools/tLocale.h

src/tools/tMemManager.cpp

src/tools/tResourceManager.cpp

src/tools/tSafePTR.h

src/tools/tToDo.cpp

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gGame.cpp

src/tron/gMenus.cpp

src/tron/gServerBrowser.cpp

src/tron/gServerFavorites.cpp

src/tron/gSpawn.h

src/tron/gWall.cpp

src/ui/uInput.cpp

src/ui/uMenu.h

Show diffs side-by-side

added added

removed removed

src/engine/eTeam.cpp

404

void eTeam::UnInvite( ePlayerNetID * player )

405

{

406

tASSERT( player );

407

size_t wasInvited = player->invitations_.erase( this );

407

408

if ( player->CurrentTeam() == this && this->IsLocked() )

408

409

{

409

410

sn_ConsoleOut( tOutput( "$invite_team_kick", player->GetColoredName(), Name() ) );

410

411

player->SetTeam(0);

411

412

}

412

else

413

else if ( wasInvited )

413

414

{

414

415

sn_ConsoleOut( tOutput( "$invite_team_uninvite", player->GetColoredName(), Name() ) );

415

416

}

416

player->invitations_.erase( this );

417

}

418

419

// check if a player is invited

Older »