From b5aa96696fb9df6012688f2cc9cb69998fa73029 Mon Sep 17 00:00:00 2001 From: dP Date: Fri, 5 Nov 2021 06:20:20 +0300 Subject: [PATCH] Add button to watch companies to online players window --- bin/data/cmclient-5.grf | Bin 135130 -> 135208 bytes grf/cmclient/gencmclientgrf.py | 6 ++++-- grf/cmclient/sprites/toolbar.png | Bin 3655 -> 3851 bytes src/network/network_gui.cpp | 6 ++++++ src/table/sprites.h | 3 ++- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/bin/data/cmclient-5.grf b/bin/data/cmclient-5.grf index 0232d3691670e596fca4ec928427523920cd9828..4cc09957fbf90d711d6f0d4e78b1d7c837c434f2 100644 GIT binary patch delta 6239 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 Jvd$@?2>^vq3kv`M diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index ac1d404041..b524146b8a 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1645,6 +1645,11 @@ private: else ScrollMainWindowToTile(company->location_of_HQ); } + static void CMOnClickCompanyWatch(NetworkClientListWindow *w, Point pt, CompanyID company_id) + { + citymania::ShowWatchWindow(company_id, 0); + } + /** * Part of RebuildList() to create the information for a single company. * @param company_id The company to build the list for. @@ -1661,6 +1666,7 @@ private: ButtonCommon *hq_button = new CompanyButton(CM_SPR_HQ, STR_NETWORK_CLIENT_LIST_CHAT_COMPANY_TOOLTIP, COLOUR_ORANGE, company_id, &NetworkClientListWindow::CMOnClickCompanyHQ); if (company->location_of_HQ == INVALID_TILE) hq_button->disabled = true; this->buttons[line_count].emplace_back(hq_button); + this->buttons[line_count].emplace_back(new CompanyButton(CM_SPR_WATCH, STR_NETWORK_CLIENT_LIST_CHAT_COMPANY_TOOLTIP, COLOUR_ORANGE, company_id, &NetworkClientListWindow::CMOnClickCompanyWatch)); } /* CityMania code end */ this->buttons[line_count].emplace_back(chat_button); diff --git a/src/table/sprites.h b/src/table/sprites.h index 954a9c6957..03c7abb38d 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -313,7 +313,8 @@ static const uint16 PALETTE_SPRITE_COUNT = 1; static const SpriteID CM_SPR_CITYMANIA_BASE = SPR_PALETTE_BASE + PALETTE_SPRITE_COUNT; static const SpriteID CM_SPR_RAIL_COPY_PASTE = CM_SPR_CITYMANIA_BASE + 2; static const SpriteID CM_SPR_HQ = CM_SPR_CITYMANIA_BASE + 3; -static const SpriteID CM_SPR_HOST = CM_SPR_CITYMANIA_BASE + 4; +static const SpriteID CM_SPR_WATCH = CM_SPR_CITYMANIA_BASE + 4; +static const SpriteID CM_SPR_HOST = CM_SPR_CITYMANIA_BASE + 5; static const SpriteID CM_SPR_PLAYER = CM_SPR_HOST + 1; static const SpriteID CM_SPR_HOST_WHITE = CM_SPR_HOST + 2; static const SpriteID CM_SPR_PLAYER_WHITE = CM_SPR_HOST + 3;