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

Added status update for LAN server searching and guard against people who click find like mad.

This commit is contained in:
Mark Vejvoda 2010-04-11 04:29:23 +00:00
parent af87e53bbe
commit 203d37bb6f
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/glest_game/menu/menu_state_join_game.cpp
View File

@ -60,6 +60,7 @@ MenuStateJoinGame::MenuStateJoinGame(Program *program, MainMenu *mainMenu, bool
buttonAutoFindServers.init(595, 300, 125);
buttonAutoFindServers.setText(lang.get("FindLANGames"));
buttonAutoFindServers.setEnabled(true);
//server type label
labelServerType.init(330, 490);
@ -131,6 +132,7 @@ MenuStateJoinGame::~MenuStateJoinGame() {
void MenuStateJoinGame::DiscoveredServers(std::vector<string> serverList) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
buttonAutoFindServers.setEnabled(true);
if(serverList.size() > 0) {
string bestIPMatch = "";
std::vector<std::string> localIPList = Socket::getLocalIPAddressList();
@ -208,18 +210,20 @@ void MenuStateJoinGame::mouseClick(int x, int y, MouseButton mouseButton)
connectToServer();
}
}
else if(buttonAutoFindServers.mouseClick(x, y)) {
else if(buttonAutoFindServers.mouseClick(x, y) && buttonAutoFindServers.getEnabled() == true) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
ClientInterface* clientInterface= networkManager.getClientInterface();
soundRenderer.playFx(coreData.getClickSoundA());
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
// Triggers a thread which calls back into MenuStateJoinGame::DiscoveredServers
// with the results
clientInterface->discoverServers(this);
if(clientInterface->isConnected() == false) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
buttonAutoFindServers.setEnabled(false);
clientInterface->discoverServers(this);
}
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}
@ -355,7 +359,11 @@ void MenuStateJoinGame::update()
else
{
buttonConnect.setText(lang.get("Connect"));
labelStatus.setText(lang.get("NotConnected"));
string connectedStatus = lang.get("NotConnected");
if(buttonAutoFindServers.getEnabled() == false) {
connectedStatus += " - searching for servers, please wait...";
}
labelStatus.setText(connectedStatus);
labelInfo.setText("");
}

3
source/shared_lib/sources/platform/win32/socket.cpp
View File

@ -1052,8 +1052,7 @@ void ServerSocket::listen(int connectionQueueSize){
if(err==SOCKET_ERROR){
throwException("Error listening socket");
}
broadCastThread = new BroadCastSocketThread();
broadCastThread->start();
startBroadCastThread();
}
Socket *ServerSocket::accept(){