← Back to branch summary

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

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

« back to all changes in this revision

Viewing changes to src/tron/gGame.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/tron/gGame.cpp

3799

3799

3800

3800

eGameObject *e=p->Object();

3801

3801

3802

if ( ( (!e) || ((!e->Alive()) && (e->DeathTime() < (time - sg_respawnTime)) ) ) && (sn_GetNetState() != nCLIENT ))

3802

if ( ( (!e) || ((!e->Alive()) && (e->DeathTime() < (time - sg_respawnTime)) ) && (sn_GetNetState() != nCLIENT )))

3803

3803

{

3804

3804

eCoord pos,dir;

3805

3805

#if 0

Older »