← 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/gServerBrowser.cpp

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/tron/gServerBrowser.cpp

579

579

#endif /* DEDICATED */

580

580

static bool sg_filterServernameColorStrings = true;

581

581

static tSettingItem< bool > removeServerNameColors("FILTER_COLOR_SERVER_NAMES", sg_filterServernameColorStrings);

582

static bool sg_filterServernameDarkColorStrings = true;

583

static tSettingItem< bool > removeServerNameDarkColors("FILTER_DARK_COLOR_SERVER_NAMES", sg_filterServernameDarkColorStrings);

582

584

583

585

void gServerMenuItem::Render(REAL x,REAL y,REAL alpha, bool selected)

584

586

{

650

652

}

651

653

652

654

if ( sg_filterServernameColorStrings )

653

name << tColoredString::RemoveColors( server->GetName() );

655

name << tColoredString::RemoveColors( server->GetName(), false );

656

else if ( sg_filterServernameDarkColorStrings )

657

name << tColoredString::RemoveColors( server->GetName(), true );

654

658

else

655

659

{

656

660

name << server->GetName();

Older »