From ac34fc6d994dab3750ba5173c2a491e826f25efb Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Fri, 28 May 2010 00:26:29 +0000 Subject: [PATCH] Commented out some mutex use that should no longer be required. --- source/glest_game/game/commander.cpp | 2 ++ source/glest_game/network/server_interface.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/source/glest_game/game/commander.cpp b/source/glest_game/game/commander.cpp index fbd2dac9..7c160b70 100644 --- a/source/glest_game/game/commander.cpp +++ b/source/glest_game/game/commander.cpp @@ -398,6 +398,8 @@ Command* Commander::buildCommand(const NetworkCommand* networkCommand) const{ sprintf(szBuf,"In [%s::%s Line: %d] Can not find command type for network command = [%s]\n%s\n in unit = %d [%s][%s].\nGame out of synch.", __FILE__,__FUNCTION__,__LINE__,networkCommand->toString().c_str(),unit->getType()->getCommandTypeListDesc().c_str(),unit->getId(), unit->getFullName().c_str(),unit->getDesc().c_str()); + SystemFlags::OutputDebug(SystemFlags::debugSystem,"%s\n",szBuf); + std::string worldLog = world->DumpWorldToLog(); std::string sError = "worldLog = " + worldLog + " " + string(szBuf); throw runtime_error(sError); diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp index 38afbeb7..c5734f07 100644 --- a/source/glest_game/network/server_interface.cpp +++ b/source/glest_game/network/server_interface.cpp @@ -693,7 +693,7 @@ void ServerInterface::broadcastGameSetup(const GameSettings* gameSettings) { void ServerInterface::broadcastMessage(const NetworkMessage* networkMessage, int excludeSlot){ - serverSynchAccessor.p(); + //serverSynchAccessor.p(); SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__); for(int i= 0; i