amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-24 12:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: make IConsoleMode a scoped enum (#15682)

Browse Source
This commit is contained in:
Peter Nelson
2026-06-06 18:52:31 +01:00
committed by GitHub
parent 14be71cb5f
commit b5ae563df1
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/console_gui.cpp
+11 -10
View File
@@ -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();
}
/**