- updates to language keynames and english strings
- added some more protection for shutdown of threads
This commit is contained in:
parent
4fc043ddb6
commit
c5485be4da
|
@ -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__);
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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"));
|
||||
|
|
Loading…
Reference in New Issue
Block a user