← Back to branch summary

~z-man/armagetronad/0.2.8-armagetronad-sty+ct

~z-man/armagetronad/0.2.8-armagetronad-sty+ct

« back to all changes in this revision

Viewing changes to src/network/nAuthentication.cpp

Committer: Manuel Moos
Date: 2020-03-08 10:07:42 UTC
mfrom: (563.24.393 source)
Revision ID: z-man@users.sf.net-20200308100742-ax3qwhjs0n5zr7l5

Merge with mainline

files added:
.dockerignore

.gitlab-ci.yml

Dockerfile

language/.gitignore

files removed:
src/thirdparty/shttpd

files modified:
.bzrignore

.gitignore

Makefile.am

batch/make/sortresources

batch/make/sortresources.py

batch/make/uninstall

batch/make/version

bootstrap.sh

configure.ac

language/english_base.txt

src/Makefile.am

src/engine/eCoord.h

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eTeam.h

src/engine/eTimer.cpp

src/engine/eVoter.cpp

src/network/l3_demo.cpp

src/network/nAuthentication.cpp

src/network/nNetObject.cpp

src/network/nNetObject.h

src/network/nNetwork.cpp

src/network/nNetwork.h

src/render/rGL.h

src/render/rTexture.cpp

src/thirdparty/binreloc/prefix.c

src/thirdparty/particles/Makefile.am

src/thirdparty/particles/p_vector.h

src/thirdparty/particles/system.cpp

src/tools/tDirectories.cpp

src/tools/tString.h

src/tron/gHud.cpp

Show diffs side-by-side

added added

removed removed

src/network/nAuthentication.cpp

1090

1090

// the finish task can also be triggered any time by this function:

1091

1091

void nLoginProcess::Abort()

1092

1092

{

1093

nMemberFunctionRunner::ScheduleBackground( *this, &nLoginProcess::Finish );

1093

nMemberFunctionRunner::ScheduleForeground( *this, &nLoginProcess::Finish );

1094

1094

}

1095

1095

1096

1096

// which, when finished, triggers the foreground task of updating the

Older »