← 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/network/nNetwork.h

Committer: wrtlprnft
Date: 2008-03-24 08:28:20 UTC
mfrom: (563.1.226)
Revision ID: wrtlprnft@users.sf.net-20080324082820-235q3jssjh059s53

Merged changes from the 0.2.8 branch.
The pighack help text got replaced by the new help menu.
To emulate the old behavior use:
REMOVE_HELP_TOPIC commands
HELP_INTRODUCTORY_BLURB <your help text>

files added:
src/tools/tColor.cpp

files modified:
AUTHORS

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

NEWS

README-Subversion

config/Makefile.am

config/settings.cfg

config/settings_authentication.cfg

config/settings_dedicated.cfg

configure.ac

language/deutsch.txt

language/english_base.txt

language/english_base_notranslate.txt

language/french.txt

src/Makefile.am

src/engine/eAdvWall.cpp

src/engine/eDisplay.cpp

src/engine/eGameObject.cpp

src/engine/eGameObject.h

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eVoter.cpp

src/engine/eVoter.h

src/macosx/config_common.h.in

src/macosx/dedicated/config.h

src/network/nAuthentication.cpp

src/network/nConfig.cpp

src/network/nConfig.h

src/network/nKrawallPrivate.cpp

src/network/nNetwork.cpp

src/network/nNetwork.h

src/network/nServerInfo.cpp

src/network/nServerInfo.h

src/network/nSocket.cpp

src/network/nSocket.h

src/render/rConsoleCout.cpp

src/render/rDisplayList.cpp

src/render/rDisplayList.h

src/render/rFont.cpp

src/render/rGL.cpp

src/render/rGLRender.cpp

src/render/rModel.cpp

src/render/rModel.h

src/render/rScreen.cpp

src/render/rTexture.cpp

src/tools/tColor.h

src/tools/tConfiguration.cpp

src/tools/tConfiguration.h

src/tools/tConsole.cpp

src/tools/tConsole.h

src/tools/tRecorder.cpp

src/tools/tResourceManager.cpp

src/tools/tString.cpp

src/tools/tString.h

src/tron/gArena.cpp

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gCycle.h

src/tron/gCycleMovement.cpp

src/tron/gCycleMovement.h

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gHud.cpp

src/tron/gMenus.cpp

src/tron/gParser.cpp

src/tron/gServerBrowser.cpp

src/tron/gTeam.cpp

src/tron/gWall.cpp

src/tron/gWall.h

src/tron/gWinZone.cpp

src/tron/gWinZone.h

src/ui/uMenu.cpp

src/ui/uMenu.h

Show diffs side-by-side

added added

removed removed

src/network/nNetwork.h

105

105

106

106

// We can be single player, multiplayer server/client.

107

107

typedef enum {nSTANDALONE,nSERVER,nCLIENT} nNetState;

108

typedef enum {nOK, nTIMEOUT, nDENIED} nConnectError;

108

typedef enum {nOK, nTIMEOUT, nDENIED, nABORT} nConnectError;

109

109

110

110

111

111

// set/get the state

620

620

621

621

// causes the connected clients to print a message

622

622

void sn_ConsoleOut(const tOutput &message,int client=-1);

623

nMessage* sn_ConsoleOutMessage(const tOutput &message);

623

nMessage* sn_ConsoleOutMessage( tString const & message );

624

624

625

625

// causes the connected clients to print a message in the center of the screeen

626

626

void sn_CenterMessage(const tOutput &message,int client=-1);

Older »