~armagetronad-dev/armagetronad/trunk-armagetronad-fortress

~armagetronad-dev/armagetronad/trunk-armagetronad-fortress_ai

« back to all changes in this revision

Viewing changes to src/engine/ePlayer.h

Committer: Manuel Moos
Date: 2010-08-07 21:08:56 UTC
mfrom: (890.1.89 armagetronad)
Revision ID: z-man@users.sf.net-20100807210856-93ljrijn34c77p5v

Merging from mainline.

files added:
config/keys_cursor.cfg

config/keys_cursor_single.cfg

config/keys_twohand.cfg

config/keys_wasd.cfg

config/keys_x.cfg

config/keys_zqsd.cfg

language/portugese.txt

files modified:
COPYING.txt

batch/rcd_startstop.in

batch/serverstarter.in

bootstrap.sh

config/Makefile.am

config/default.cfg

config/settings.cfg

configure.ac

language/american.txt

language/british.txt

language/deutsch.txt

language/english_base.txt

language/english_base_notranslate.txt

language/new.txt

src/doc/bugs.html.m4

src/doc/changelog.html.m4

src/engine/eCamera.cpp

src/engine/eCamera.h

src/engine/eGameObject.cpp

src/engine/eGameObject.h

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eVoter.cpp

src/network/nNetObject.cpp

src/network/nNetwork.cpp

src/network/nProtoBuf.cpp

src/render/rConsole.h

src/render/rConsoleGraph.cpp

src/render/rFont.h

src/render/rViewport.cpp

src/resource/tResource.cpp

src/resource/tResourceManager.cpp

src/tools/tColor.h

src/tools/tMemManager.cpp

src/tools/tMemManager.h

src/tools/tRecorder.cpp

src/tools/tSysTime.cpp

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gCycleMovement.cpp

src/tron/gCycleMovement.h

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gLanguageMenu.cpp

src/tron/gLanguageMenu.h

src/tron/gLogo.cpp

src/tron/gMenus.cpp

src/tron/gParser.cpp

src/tron/gParser.h

src/tron/gServerBrowser.cpp

src/tron/gServerFavorites.cpp

src/tron/gServerFavorites.h

src/tron/gSparks.cpp

src/tron/gTeam.cpp

src/ui/uInput.cpp

src/ui/uInput.h

src/ui/uMenu.cpp

src/ui/uMenu.h

Show diffs side-by-side

added added

removed removed

src/engine/ePlayer.h

class ePlayer: public uPlayerPrototype{

friend class eMenuItemChat;

static uActionPlayer s_chat;

static uActionTooltip s_chatTooltip;

tConfItemBase *configuration[PLAYER_CONFITEMS];

int CurrentConfitem;

void StoreConfitem(tConfItemBase *c);

void DeleteConfitems();

double lastTooltip_;

public:

tString name; // the player's screen name

100

tString globalID; // the global ID of the player in user@authority form

141

144

142

145

static bool PlayerIsInGame(int p);

143

146

147

// veto function for tooltips that require a controllable game object

148

static bool VetoActiveTooltip(int player);

149

144

150

static rViewport * PlayerViewport(int p);

145

151

146

152

static void LogIn(); //!< sends authentication login messages for all local players

Older »