diff --git a/mk/windoze/Glest.suo b/mk/windoze/Glest.suo index 87b26735..d19c8660 100755 Binary files a/mk/windoze/Glest.suo and b/mk/windoze/Glest.suo differ diff --git a/source/glest_game/network/network_message.cpp b/source/glest_game/network/network_message.cpp index 4efe3ad0..2a8d414c 100644 --- a/source/glest_game/network/network_message.cpp +++ b/source/glest_game/network/network_message.cpp @@ -596,7 +596,7 @@ bool NetworkMessageSynchNetworkGameData::receive(Socket* socket) { for(int iPacketLoop = 0; iPacketLoop < packetLoopCount; ++iPacketLoop) { int packetIndex = iPacketLoop * maxFileCRCPacketCount; - int packetFileCount = std::min(maxFileCRCPacketCount,data.header.techCRCFileCount - packetIndex); + int packetFileCount = min(maxFileCRCPacketCount,data.header.techCRCFileCount - packetIndex); for(int peekAttempt = 1; peekAttempt < 5000; peekAttempt++) { SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] peekAttempt = %d\n",__FILE__,__FUNCTION__,__LINE__,peekAttempt); @@ -655,7 +655,7 @@ void NetworkMessageSynchNetworkGameData::send(Socket* socket) const { for(int iPacketLoop = 0; iPacketLoop < packetLoopCount; ++iPacketLoop) { int packetIndex = iPacketLoop * maxFileCRCPacketCount; - int packetFileCount = std::min(maxFileCRCPacketCount,data.header.techCRCFileCount - packetIndex); + int packetFileCount = min(maxFileCRCPacketCount,data.header.techCRCFileCount - packetIndex); NetworkMessage::send(socket, &data.detail.techCRCFileList[packetIndex], (DetailSize1 * packetFileCount)); NetworkMessage::send(socket, &data.detail.techCRCFileCRCList[packetIndex], (DetailSize2 * packetFileCount)); @@ -770,7 +770,7 @@ bool NetworkMessageSynchNetworkGameDataStatus::receive(Socket* socket) { for(int iPacketLoop = 0; iPacketLoop < packetLoopCount; ++iPacketLoop) { int packetIndex = iPacketLoop * maxFileCRCPacketCount; - int packetFileCount = std::min(maxFileCRCPacketCount,data.header.techCRCFileCount - packetIndex); + int packetFileCount = min(maxFileCRCPacketCount,data.header.techCRCFileCount - packetIndex); SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] iPacketLoop = %d, packetIndex = %d, packetFileCount = %d\n",__FILE__,__FUNCTION__,__LINE__,iPacketLoop,packetIndex,packetFileCount); @@ -833,7 +833,7 @@ void NetworkMessageSynchNetworkGameDataStatus::send(Socket* socket) const { for(int iPacketLoop = 0; iPacketLoop < packetLoopCount; ++iPacketLoop) { int packetIndex = iPacketLoop * maxFileCRCPacketCount; - int packetFileCount = std::min(maxFileCRCPacketCount,data.header.techCRCFileCount - packetIndex); + int packetFileCount = min(maxFileCRCPacketCount,data.header.techCRCFileCount - packetIndex); SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] packetLoop = %d, packetIndex = %d, packetFileCount = %d\n",__FILE__,__FUNCTION__,__LINE__,iPacketLoop,packetIndex,packetFileCount);