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

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

« back to all changes in this revision

Viewing changes to src/tron/gServerFavorites.cpp

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

165

}

166

167

return false;

168

}

168

}

169

170

bool RemoveFavorite( nServerInfoBase const * server )

171

{

172

if ( !server )

173

return false;

174

175

for ( int i = 0; i<NUM_FAVORITES; i++ )

176

{

177

gServerFavorite & fav = GetFavorite(i);

178

179

if (fav.name_ == tColoredString::RemoveColors(server->GetName())) {

180

fav.name_ = "";

181

return true;

182

}

183

}

184

185

return false;

186

}

169

187

170

188

bool IsFavorite( nServerInfoBase const * server )

171

189

{

532

550

533

551

// *********************************************************************************************

534

552

// *

553

// * RemoveFavorite

554

// *

555

// *********************************************************************************************

556

//!

557

//! @param server the server to remove from the favorites

558

//! @return true if successful, false if the server does not exist

559

//!

560

// *********************************************************************************************

561

562

bool gServerFavorites::RemoveFavorite ( nServerInfoBase const * server )

563

{

564

return sg_favoriteHolder.RemoveFavorite( server );

565

}

566

567

// *********************************************************************************************

568

// *

535

569

// * IsFavorite

536

570

// *

537

571

// *********************************************************************************************

Older »