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

- bugfixes to master server communication logic when starting a game. Now we only send updates if the game was published, not for every network game. Also we properly delete the game from the masterserver when it has ended.

Browse Source
This commit is contained in:
Mark Vejvoda 2010-10-23 22:06:49 +00:00
parent 6a0e876bf2
commit c3d41f5082
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -956,6 +956,11 @@ void MenuStateCustomGame::PlayNow() {
lastSetChangedGameSettings = time(NULL);
}
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
// Tell the server Interface whether or not to publish game status updates to masterserver
serverInterface->setNeedToRepublishToMasterserver(listBoxPublishServer.getSelectedItemIndex() == 0);
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
bool bOkToStart = serverInterface->launchGame(&gameSettings);
if(bOkToStart == true) {

8
source/glest_game/network/server_interface.cpp
View File

@ -66,6 +66,7 @@ ServerInterface::ServerInterface() {
gameStartTime = 0;
publishToMasterserverThread = NULL;
lastMasterserverHeartbeatTime = 0;
needToRepublishToMasterserver = false;
enabledThreadedClientCommandBroadcast = Config::getInstance().getBool("EnableThreadedClientCommandBroadcast","false");
maxFrameCountLagAllowed = Config::getInstance().getInt("MaxFrameCountLagAllowed",intToStr(maxFrameCountLagAllowed).c_str());
@ -103,7 +104,8 @@ ServerInterface::~ServerInterface() {
delete publishToMasterserverThread;
publishToMasterserverThread = NULL;
safeMutex.ReleaseLock();
// This triggers a gameOVer message to be sent to the masterserver
// This triggers a gameOver message to be sent to the masterserver
lastMasterserverHeartbeatTime = 0;
simpleTask();
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
@ -1076,6 +1078,7 @@ bool ServerInterface::launchGame(const GameSettings* gameSettings) {
delete publishToMasterserverThread;
publishToMasterserverThread = NULL;
lastMasterserverHeartbeatTime = 0;
publishToMasterserverThread = new SimpleTaskThread(this,0,25);
publishToMasterserverThread->setUniqueID(__FILE__);
publishToMasterserverThread->start();
@ -1453,8 +1456,7 @@ void ServerInterface::simpleTask() {
lastMasterserverHeartbeatTime = time(NULL);
bool isNetworkGame = (this->getGameSettings() != NULL && this->getGameSettings()->isNetworkGame());
if(isNetworkGame == true) {
if(needToRepublishToMasterserver == true) {
//string request = Config::getInstance().getString("Masterserver") + "addServerInfo.php?" + newPublishToServerInfo;
string request = Config::getInstance().getString("Masterserver") + "addServerInfo.php?";

4
source/glest_game/network/server_interface.h
View File

@ -45,6 +45,7 @@ private:
SimpleTaskThread *publishToMasterserverThread;
Mutex masterServerThreadAccessor;
time_t lastMasterserverHeartbeatTime;
bool needToRepublishToMasterserver;
public:
ServerInterface();
@ -103,6 +104,9 @@ public:
virtual string getHumanPlayerName(int index=-1);
virtual int getHumanPlayerIndex() const;
bool getNeedToRepublishToMasterserver() const {return needToRepublishToMasterserver;}
void setNeedToRepublishToMasterserver(bool value) {needToRepublishToMasterserver = value;}
public:
Mutex * getServerSynchAccessor() { return &serverSynchAccessor; }