From b5ae563df192d73c3a076c0401bc3cbaf8a1ac0b Mon Sep 17 00:00:00 2001
From: Peter Nelson <peter1138@openttd.org>
Date: Sat, 6 Jun 2026 18:52:31 +0100
Subject: [PATCH] Codechange: make IConsoleMode a scoped enum (#15682)

---
 src/console_func.h               |  2 +-
 src/console_gui.cpp              | 21 +++++++++++----------
 src/console_type.h               |  8 ++++----
 src/network/network_chat_gui.cpp |  2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/console_func.h b/src/console_func.h
index 3fb3db2849..a1ce93cb37 100644
--- a/src/console_func.h
+++ b/src/console_func.h
@@ -14,7 +14,7 @@
 #include "core/format.hpp"
 
 /** Console modes. */
-extern IConsoleModes _iconsole_mode;
+extern IConsoleMode _iconsole_mode;
 
 /* console functions */
 void IConsoleInit();
diff --git a/src/console_gui.cpp b/src/console_gui.cpp
index fc66e3562e..e7bb691c7a 100644
--- a/src/console_gui.cpp
+++ b/src/console_gui.cpp
@@ -111,7 +111,7 @@ static Textbuf _iconsole_cmdline(ICON_CMDLN_SIZE);
 static ConsoleAutoCompletion _iconsole_tab_completion(&_iconsole_cmdline);
 static std::deque<std::string> _iconsole_history;
 static ptrdiff_t _iconsole_historypos;
-IConsoleModes _iconsole_mode;
+IConsoleMode _iconsole_mode;
 
 /* *************** *
  *  end of header  *
@@ -154,7 +154,7 @@ struct IConsoleWindow : Window
 
 	IConsoleWindow() : Window(_console_window_desc)
 	{
-		_iconsole_mode = ICONSOLE_OPENED;
+		_iconsole_mode = IConsoleMode::Opened;
 
 		this->InitNested(0);
 		ResizeWindow(this, _screen.width, _screen.height / 3);
@@ -169,7 +169,7 @@ struct IConsoleWindow : Window
 
 	void Close([[maybe_unused]] int data = 0) override
 	{
-		_iconsole_mode = ICONSOLE_CLOSED;
+		_iconsole_mode = IConsoleMode::Closed;
 		VideoDriver::GetInstance()->EditBoxLostFocus();
 		this->Window::Close();
 	}
@@ -286,7 +286,7 @@ struct IConsoleWindow : Window
 			}
 
 			case WKC_CTRL | WKC_RETURN:
-				_iconsole_mode = (_iconsole_mode == ICONSOLE_FULL) ? ICONSOLE_OPENED : ICONSOLE_FULL;
+				_iconsole_mode = (_iconsole_mode == IConsoleMode::Full) ? IConsoleMode::Opened : IConsoleMode::Full;
 				IConsoleResize(this);
 				MarkWholeScreenDirty();
 				break;
@@ -384,7 +384,7 @@ size_t IConsoleWindow::scroll = 0;
 void IConsoleGUIInit()
 {
 	IConsoleResetHistoryPos();
-	_iconsole_mode = ICONSOLE_CLOSED;
+	_iconsole_mode = IConsoleMode::Closed;
 
 	IConsoleClearBuffer();
 
@@ -412,11 +412,11 @@ void IConsoleGUIFree()
 void IConsoleResize(Window *w)
 {
 	switch (_iconsole_mode) {
-		case ICONSOLE_OPENED:
+		case IConsoleMode::Opened:
 			w->height = _screen.height / 3;
 			w->width = _screen.width;
 			break;
-		case ICONSOLE_FULL:
+		case IConsoleMode::Full:
 			w->height = _screen.height - ICON_BOTTOM_BORDERWIDTH;
 			w->width = _screen.width;
 			break;
@@ -430,11 +430,12 @@ void IConsoleResize(Window *w)
 void IConsoleSwitch()
 {
 	switch (_iconsole_mode) {
-		case ICONSOLE_CLOSED:
+		case IConsoleMode::Closed:
 			new IConsoleWindow();
 			break;
 
-		case ICONSOLE_OPENED: case ICONSOLE_FULL:
+		case IConsoleMode::Opened:
+		case IConsoleMode::Full:
 			CloseWindowById(WindowClass::Console, 0);
 			break;
 	}
@@ -445,7 +446,7 @@ void IConsoleSwitch()
 /** Close the in-game console. */
 void IConsoleClose()
 {
-	if (_iconsole_mode == ICONSOLE_OPENED) IConsoleSwitch();
+	if (_iconsole_mode == IConsoleMode::Opened) IConsoleSwitch();
 }
 
 /**
diff --git a/src/console_type.h b/src/console_type.h
index 78f17fa5bd..688ededc25 100644
--- a/src/console_type.h
+++ b/src/console_type.h
@@ -13,10 +13,10 @@
 #include "gfx_type.h"
 
 /** Modes of the in-game console. */
-enum IConsoleModes : uint8_t {
-	ICONSOLE_FULL,   ///< In-game console is opened, whole screen.
-	ICONSOLE_OPENED, ///< In-game console is opened, upper 1/3 of the screen.
-	ICONSOLE_CLOSED, ///< In-game console is closed.
+enum class IConsoleMode : uint8_t {
+	Full, ///< In-game console is opened, whole screen.
+	Opened, ///< In-game console is opened, upper 1/3 of the screen.
+	Closed, ///< In-game console is closed.
 };
 
 /* Colours of the console messages. */
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
index b6b48ba186..19d2d6ba15 100644
--- a/src/network/network_chat_gui.cpp
+++ b/src/network/network_chat_gui.cpp
@@ -184,7 +184,7 @@ void NetworkDrawChatMessage()
 	/* First undraw if needed */
 	NetworkUndrawChatMessage();
 
-	if (_iconsole_mode == ICONSOLE_FULL) return;
+	if (_iconsole_mode == IConsoleMode::Full) return;
 
 	/* Check if we have anything to draw at all */
 	if (!HaveChatMessages(show_all)) return;