From 52d6a579e55b485b5b8ea4685cc72277322b8161 Mon Sep 17 00:00:00 2001 From: Cyprian Klimaszewski Date: Thu, 8 Jan 2026 23:26:24 +0100 Subject: [PATCH] Codefix: Use special values of CompanyID instead of CTMN "enum" (#14886) --- src/toolbar_gui.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index 267f4524a9..7f8c7200f3 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -146,10 +146,11 @@ static void PopupMainToolbarMenu(Window *w, WidgetID widget, const std::initiali PopupMainToolbarMenu(w, widget, std::move(list), 0); } -/** Enum for the Company Toolbar's network related buttons */ -static const int CTMN_CLIENT_LIST = -1; ///< Show the client list -static const int CTMN_SPECTATE = -2; ///< Become spectator -static const int CTMN_SPECTATOR = -3; ///< Show a company window as spectator +/* Special values used in the dropdowns related to companies. + * They cannot interfere with valid IDs for companies. */ +static const int CTMN_CLIENT_LIST = MAX_COMPANIES; ///< Indicates the "all connected players" entry. +static const int CTMN_SPECTATE = COMPANY_SPECTATOR.base(); ///< Indicates the "become spectator" entry. +static const int CTMN_SPECTATOR = CompanyID::Invalid().base(); ///< Indicates that a window is being opened for the spectator. /** * Pop up a generic company list menu. @@ -619,7 +620,7 @@ static CallBackFunction ToolbarStoryClick(Window *w) */ static CallBackFunction MenuClickStory(int index) { - ShowStoryBook(index == CTMN_SPECTATOR ? CompanyID::Invalid() : (CompanyID)index); + ShowStoryBook(CompanyID(index)); return CBF_NONE; } @@ -639,7 +640,7 @@ static CallBackFunction ToolbarGoalClick(Window *w) */ static CallBackFunction MenuClickGoal(int index) { - ShowGoalsList(index == CTMN_SPECTATOR ? CompanyID::Invalid() : (CompanyID)index); + ShowGoalsList(CompanyID(index)); return CBF_NONE; }