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

- windows compile bugfixes

This commit is contained in:
Mark Vejvoda 2010-08-26 05:43:08 +00:00
parent db173d0fdd
commit 8274ff1efb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
mk/windoze/Glest.suo
View File

Binary file not shown.

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

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