mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-02-25 04:02:30 +01:00
Code Issues Projects Releases Wiki Activity

Commented out some mutex use that should no longer be required.

Browse Source
This commit is contained in:
Mark Vejvoda 2010-05-28 00:26:29 +00:00
parent 0aade73335
commit ac34fc6d99
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/game/commander.cpp
View File

@ -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);

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

@ -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<GameConstants::maxPlayers; ++i) {
@ -718,13 +718,13 @@ void ServerInterface::broadcastMessage(const NetworkMessage* networkMessage, int
}
}
serverSynchAccessor.v();
//serverSynchAccessor.v();
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
}
void ServerInterface::broadcastMessageToConnectedClients(const NetworkMessage* networkMessage, int excludeSlot){
serverSynchAccessor.p();
//serverSynchAccessor.p();
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
@ -741,7 +741,7 @@ void ServerInterface::broadcastMessageToConnectedClients(const NetworkMessage* n
}
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
serverSynchAccessor.v();
//serverSynchAccessor.v();
}
void ServerInterface::updateListen() {