mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-21 15:41:24 +02:00
Code Issues Projects Releases Wiki Activity

better handling of attention sound / errormessages ...

Browse Source
This commit is contained in:
Titus Tscharntke
2010-05-17 20:05:31 +00:00
parent 8be87ee362
commit 70383f2a30
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, b
lastMasterserverPublishing = 0; lastMasterserverPublishing = 0;
soundConnectionCount=0; soundConnectionCount=0;
mainMessageBox.init(lang.get("Ok"),lang.get("Return")); mainMessageBox.init(lang.get("Ok"));
mainMessageBox.setEnabled(false); mainMessageBox.setEnabled(false);
mainMessageBoxState=0; mainMessageBoxState=0;
@@ -266,10 +266,6 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
{ {
mainMessageBox.setEnabled(false); mainMessageBox.setEnabled(false);
} }
else if(button==2)
{
returnToParentMenu();
}
} }
} }
else if(buttonReturn.mouseClick(x,y)){ else if(buttonReturn.mouseClick(x,y)){
@@ -534,7 +530,7 @@ void MenuStateCustomGame::update()
{ {
masterServererErrorToShow=lang.get("wrong router setup"); masterServererErrorToShow=lang.get("wrong router setup");
} }
showMasterserverError=true; showMasterserverError=false;
listBoxPublishServer.setSelectedItemIndex(1); listBoxPublishServer.setSelectedItemIndex(1);
mainMessageBoxState=1; mainMessageBoxState=1;
showMessageBox( masterServererErrorToShow, lang.get("ErrorFromMasterserver"), false); showMessageBox( masterServererErrorToShow, lang.get("ErrorFromMasterserver"), false);
@@ -609,6 +605,7 @@ void MenuStateCustomGame::update()
//printf("FYI we have at least 1 client connected, slot = %d'\n",i); //printf("FYI we have at least 1 client connected, slot = %d'\n",i);
haveAtLeastOneNetworkClientConnected = true; haveAtLeastOneNetworkClientConnected = true;
if(connectionSlot->getName()!="")
currentConnectionCount++; currentConnectionCount++;
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] B - ctNetwork\n",__FILE__,__FUNCTION__); //SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] B - ctNetwork\n",__FILE__,__FUNCTION__);