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

reload defaults in headless mode if last player disconnects 

If last player disconnects form a headless server the headless loads his defaults
for network games.
This commit is contained in:
titiger 2015-06-24 12:38:05 +02:00
parent 803526d866
commit 68ef7471d5
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,6 +110,7 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
hasCheckedForUPNP = false;
needToPublishDelayed=false;
mapPublishingDelayTimer=time(NULL);
headlessHasConnectedPlayer=false;
lastCheckedCRCTilesetName = "";
lastCheckedCRCTechtreeName = "";
@ -1079,7 +1080,6 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton) {
string advanceToItemStartingWith = "";
if(::Shared::Platform::Window::isKeyStateModPressed(KMOD_SHIFT) == true) {
const wchar_t lastKey = ::Shared::Platform::Window::extractLastKeyPressed();
// xxx:
// string hehe=lastKey;
// printf("lastKey = %d [%c] '%s'\n",lastKey,lastKey,hehe);
advanceToItemStartingWith = lastKey;
@ -2885,6 +2885,10 @@ void MenuStateCustomGame::update() {
//}
}
if(this->headlessServerMode == true) {
lastPlayerDisconnected();
}
//call the chat manager
chatManager.updateNetwork();
@ -4171,6 +4175,34 @@ void MenuStateCustomGame::setupUIFromGameSettings(const GameSettings &gameSettin
}
// ============ PRIVATE ===========================
void MenuStateCustomGame::lastPlayerDisconnected() {
// this is for headless mode only!
// if last player disconnects we load the network defaults.
if(this->headlessServerMode == false) {
return;
}
ServerInterface* serverInterface= NetworkManager::getInstance().getServerInterface();
bool foundConnectedPlayer=false;
for(int i = 0; i < GameConstants::maxPlayers; ++i) {
if(serverInterface->getSlot(i,true) != NULL &&
(listBoxControls[i].getSelectedItemIndex() == ctNetwork ||
listBoxControls[i].getSelectedItemIndex() == ctNetworkUnassigned)) {
if(serverInterface->getSlot(i,true)->isConnected() == true) {
foundConnectedPlayer=true;
}
}
}
if(!foundConnectedPlayer && headlessHasConnectedPlayer==true ){
// load defaults
string data_path = getGameReadWritePath(GameConstants::path_data_CacheLookupKey);
if(fileExists(data_path + DEFAULT_NETWORKGAME_FILENAME) == true)
loadGameSettings(data_path + DEFAULT_NETWORKGAME_FILENAME);
}
headlessHasConnectedPlayer=foundConnectedPlayer;
}
bool MenuStateCustomGame::hasNetworkGameSettings() {
bool hasNetworkSlot = false;

3
source/glest_game/menu/menu_state_custom_game.h
View File

@ -145,6 +145,8 @@ private:
time_t mapPublishingDelayTimer;
bool needToPublishDelayed;
bool headlessHasConnectedPlayer;
bool needToRepublishToMasterserver;
bool needToBroadcastServerSettings;
std::map<string,string> publishToServerInfo;
@ -251,6 +253,7 @@ public:
virtual bool isVideoPlaying();
private:
void lastPlayerDisconnected();
bool hasNetworkGameSettings();
void loadGameSettings(GameSettings *gameSettings, bool forceCloseUnusedSlots=false);
void loadMapInfo(string file, MapInfo *mapInfo,bool loadMapPreview);