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

5 seconds delay to switch over maps you don't want to distribute ( maybe tilesets shoudl do the same? )

Browse Source
This commit is contained in:
Titus Tscharntke 2011-01-29 20:13:29 +00:00
parent 632ab24b50
commit 7d09f24b9e
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,8 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, b
currentFactionName_factionPreview=""; currentFactionName_factionPreview="";
mapPreviewTexture=NULL; mapPreviewTexture=NULL;
hasCheckedForUPNP = false; hasCheckedForUPNP = false;
needToPublishMap=false;
mapPublishingDelayTimer=time(NULL);
publishToMasterserverThread = NULL; publishToMasterserverThread = NULL;
Lang &lang= Lang::getInstance(); Lang &lang= Lang::getInstance();
@ -663,8 +665,9 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
if(hasNetworkGameSettings() == true) if(hasNetworkGameSettings() == true)
{ {
needToSetChangedGameSettings = true; //delay publishing for 5 seconds
lastSetChangedGameSettings = time(NULL); needToPublishMap=true;
mapPublishingDelayTimer=time(NULL);
} }
} }
else if (listBoxAdvanced.getSelectedItemIndex() == 1 && listBoxFogOfWar.mouseClick(x, y)) { else if (listBoxAdvanced.getSelectedItemIndex() == 1 && listBoxFogOfWar.mouseClick(x, y)) {
@ -1704,28 +1707,38 @@ void MenuStateCustomGame::update() {
// give it to me baby, aha aha ... // give it to me baby, aha aha ...
publishToMasterserver(); publishToMasterserver();
} }
if(needToPublishMap){
// this delay is done to make it possible to switch over maps which are not meant to be distributed
if(difftime(time(NULL), mapPublishingDelayTimer) >= 5){
// after 5 seconds we are allowed to publish again!
needToSetChangedGameSettings = true;
lastSetChangedGameSettings = time(NULL);
// set to normal....
needToPublishMap=false;
}
}
if(!needToPublishMap){
bool broadCastSettings = (difftime(time(NULL),lastSetChangedGameSettings) >= 2);
bool broadCastSettings = (difftime(time(NULL),lastSetChangedGameSettings) >= 2); if(broadCastSettings == true) {
needToBroadcastServerSettings=true;
}
if(broadCastSettings == true) { if(chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis());
needToBroadcastServerSettings=true; if(chrono.getMillis() > 0) chrono.start();
//call the chat manager
chatManager.updateNetwork();
//console
console.update();
broadCastSettings = (difftime(time(NULL),lastSetChangedGameSettings) >= 2);
if (broadCastSettings == true) {// reset timer here on bottom becasue used for different things
lastSetChangedGameSettings = time(NULL);
}
} }
if(chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis());
if(chrono.getMillis() > 0) chrono.start();
//call the chat manager
chatManager.updateNetwork();
//console
console.update();
broadCastSettings = (difftime(time(NULL),lastSetChangedGameSettings) >= 2);
if(broadCastSettings == true)
{// reset timer here on bottom becasue used for different things
lastSetChangedGameSettings = time(NULL);
}
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
if(chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis()); if(chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis());

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

@ -97,6 +97,8 @@ private:
time_t lastSetChangedGameSettings; time_t lastSetChangedGameSettings;
time_t lastMasterserverPublishing; time_t lastMasterserverPublishing;
time_t lastNetworkPing; time_t lastNetworkPing;
time_t mapPublishingDelayTimer;
bool needToPublishMap;
bool needToRepublishToMasterserver; bool needToRepublishToMasterserver;
bool needToBroadcastServerSettings; bool needToBroadcastServerSettings;