From f8278ec032a33b8f3ba8d449119d74f32376c4bb Mon Sep 17 00:00:00 2001 From: def Date: Sat, 16 Aug 2014 01:06:17 +0200 Subject: [PATCH] Display map name while downloading Conflicts: src/engine/client.h src/engine/client/client.h --- src/engine/client.h | 1 + src/engine/client/client.h | 1 + src/game/client/components/menus.cpp | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/engine/client.h b/src/engine/client.h index e1418f40d..1ebc9939f 100644 --- a/src/engine/client.h +++ b/src/engine/client.h @@ -92,6 +92,7 @@ public: virtual void EnterGame() = 0; // + virtual const char *MapDownloadName() = 0; virtual int MapDownloadAmount() const = 0; virtual int MapDownloadTotalsize() const = 0; diff --git a/src/engine/client/client.h b/src/engine/client/client.h index 4b70a588c..44014099b 100644 --- a/src/engine/client/client.h +++ b/src/engine/client/client.h @@ -259,6 +259,7 @@ public: void ProcessConnlessPacket(CNetChunk *pPacket); void ProcessServerPacket(CNetChunk *pPacket); + virtual const char *MapDownloadName() { return m_aMapdownloadName; } virtual int MapDownloadAmount() const { return m_MapdownloadAmount; } virtual int MapDownloadTotalsize() const { return m_MapdownloadTotalsize; } diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index c556985f4..f9513dd09 100644 --- a/src/game/client/components/menus.cpp +++ b/src/game/client/components/menus.cpp @@ -1697,7 +1697,8 @@ int CMenus::Render() pButtonText = Localize("Abort"); if(Client()->MapDownloadTotalsize() > 0) { - pTitle = Localize("Downloading map"); + str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Downloading map"), Client()->MapDownloadName()); + pTitle = aBuf; pExtraText = ""; NumOptions = 5; }