Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- updates to language keynames and english strings

Browse Source 
- added some more protection for shutdown of threads
This commit is contained in:
Mark Vejvoda 2010-05-13 07:22:33 +00:00
parent 4fc043ddb6
commit c5485be4da
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/glest_game/menu/menu_state_custom_game.cpp
View File

@ -118,7 +118,7 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, b
labelPublishServer.init(350, 690, 100);
labelPublishServer.setText(lang.get("Publish Server"));
labelPublishServer.setText(lang.get("PublishServer"));
listBoxPublishServer.init(350, 660, 100);
listBoxPublishServer.pushBackItem(lang.get("Yes"));
listBoxPublishServer.pushBackItem(lang.get("No"));
@ -244,6 +244,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
}
*/
BaseThread::shutdownAndWait(publishToMasterserverThread);
mainMenu->setState(new MenuStateNewGame(program, mainMenu));
}
else if(buttonPlayNow.mouseClick(x,y) && buttonPlayNow.getEnabled()) {
@ -282,6 +283,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
publishToMasterserver();
simpleTask();
}
BaseThread::shutdownAndWait(publishToMasterserverThread);
program->setState(new Game(program, &gameSettings));
}
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);

4
source/glest_game/menu/menu_state_masterserver.cpp
View File

@ -132,12 +132,12 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
// header
labelTitle.init(330, 700);
labelTitle.setText(lang.get("Available Servers"));
labelTitle.setText(lang.get("AvailableServers"));
buttonRefresh.init(450, 70, 150);
buttonReturn.init(150, 70, 150);
buttonRefresh.setText(lang.get("Refresh List"));
buttonRefresh.setText(lang.get("RefreshList"));
buttonReturn.setText(lang.get("Return"));
NetworkManager::getInstance().end();

2
source/glest_game/menu/menu_state_root.cpp
View File

@ -54,7 +54,7 @@ MenuStateRoot::MenuStateRoot(Program *program, MainMenu *mainMenu):
buttonNewGame.setText(lang.get("NewGame"));
buttonJoinGame.setText(lang.get("JoinGame"));
buttonMasterserverGame.setText(lang.get("JoinInternetGame(work in progress!!)"));
buttonMasterserverGame.setText(lang.get("JoinInternetGame"));
buttonOptions.setText(lang.get("Options"));
buttonAbout.setText(lang.get("About"));
buttonExit.setText(lang.get("Exit"));