[Balder-cvs] balder2d/src/menu menu.cpp,1.21,1.22
Status: Beta
Brought to you by:
holomorph
From: Bjorn H. <hol...@us...> - 2006-03-23 23:14:16
|
Update of /cvsroot/balder/balder2d/src/menu In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20919/src/menu Modified Files: menu.cpp Log Message: fix being able to configure probes that won't be playing Index: menu.cpp =================================================================== RCS file: /cvsroot/balder/balder2d/src/menu/menu.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** menu.cpp 23 Mar 2006 02:52:34 -0000 1.21 --- menu.cpp 23 Mar 2006 23:14:13 -0000 1.22 *************** *** 160,164 **** ConfigManager::SetNumPlayers(numPlayers); ConfigManager::SaveConfigFile(); ! } else if (action == "gameSetupMenu"){ optionsMenu->setVisible(false); --- 160,164 ---- ConfigManager::SetNumPlayers(numPlayers); ConfigManager::SaveConfigFile(); ! } else if (action == "gameSetupMenu"){ optionsMenu->setVisible(false); *************** *** 172,175 **** --- 172,176 ---- optionsMenu->setVisible(false); playersMenu->setVisible(true); + RefreshKeys(); } else if (action == "multiplayerMenu"){ *************** *** 206,210 **** } else if (action == "nextPlayer") { ! if (currentPlayer < 8){ ++currentPlayer; RefreshKeys(); --- 207,211 ---- } else if (action == "nextPlayer") { ! if (currentPlayer < numPlayers){ ++currentPlayer; RefreshKeys(); *************** *** 338,341 **** --- 339,343 ---- void Menu::RefreshKeys() { + if (currentPlayer > numPlayers) {currentPlayer = numPlayers;} std::stringstream ss; ss << "Player " << currentPlayer; |