From 24eaa0a56d5e9780025c51fb7f2b7f8ae96a4d26 Mon Sep 17 00:00:00 2001 From: janisozaur Date: Sun, 17 Apr 2016 22:27:23 +0200 Subject: [PATCH] Show units used when streaming the map over network. Fix #3328 (#3331) --- data/language/english_uk.txt | 2 +- src/network/network.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index 3277ca754e..5e8575701b 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -4064,7 +4064,7 @@ STR_5755 :Incorrect Software Version STR_5756 :Bad Password STR_5757 :Server Full STR_5758 :{OUTLINE}{GREEN}{STRING} has joined the game -STR_5759 :Downloading map ... ({INT32} / {INT32}) +STR_5759 :Downloading map ... ({INT32} / {INT32}) KiB STR_5760 :Hong Kong Dollars (HK$) STR_5761 :New Taiwan Dollar (NT$) STR_5762 :Chinese Yuan (CN{YEN}) diff --git a/src/network/network.cpp b/src/network/network.cpp index 3467d5e93c..8752fb944a 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -1355,7 +1355,7 @@ void Network::Server_Send_MAP(NetworkConnection* connection) SDL_RWclose(rw); return; } - size_t chunksize = 1000; + size_t chunksize = 1024; size_t out_size = size; unsigned char *compressed = util_zlib_deflate(&buffer[0], size, &out_size); unsigned char *header; @@ -1765,7 +1765,7 @@ void Network::Client_Handle_MAP(NetworkConnection& connection, NetworkPacket& pa chunk_buffer.resize(offset + chunksize); } char str_downloading_map[256]; - unsigned int downloading_map_args[2] = {(offset + chunksize) / 1000, size / 1000}; + unsigned int downloading_map_args[2] = {(offset + chunksize) / 1024, size / 1024}; format_string(str_downloading_map, STR_MULTIPLAYER_DOWNLOADING_MAP, downloading_map_args); window_network_status_open(str_downloading_map, []() -> void { gNetwork.Close();