diff options
author | rubidium <rubidium@openttd.org> | 2010-12-05 15:08:41 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2010-12-05 15:08:41 +0000 |
commit | 5f25cdbbd56d723694932598abc91f3728578f38 (patch) | |
tree | 9cf0f157ac423799620b638e33044b619f46a572 /src/network/network_client.cpp | |
parent | ff8a01fbd26cdab6bbd77900391a0085866fb787 (diff) | |
download | openttd-5f25cdbbd56d723694932598abc91f3728578f38.tar.xz |
(svn r21401) -Fix: ofcourse MSVC x64 has something to complain about...
Diffstat (limited to 'src/network/network_client.cpp')
-rw-r--r-- | src/network/network_client.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index 281c2e928..a0a828a37 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -64,7 +64,7 @@ struct PacketReader : LoadFilter { assert(this->read_bytes == 0); size_t in_packet = p->size - p->pos; - size_t to_write = min(this->bufe - this->buf, in_packet); + size_t to_write = min((size_t)(this->bufe - this->buf), in_packet); const byte *pbuf = p->buffer + p->pos; this->written_bytes += in_packet; @@ -805,7 +805,7 @@ DEF_GAME_RECEIVE_COMMAND(Client, PACKET_SERVER_MAP_DATA) /* We are still receiving data, put it to the file */ this->savegame->AddPacket(p); - _network_join_bytes = this->savegame->written_bytes; + _network_join_bytes = (uint32)this->savegame->written_bytes; SetWindowDirty(WC_NETWORK_STATUS_WINDOW, 0); return NETWORK_RECV_STATUS_OKAY; |