amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-23 19:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: separate TextColour enumeration and flags

Browse Source
This commit is contained in:
Rubidium
2026-04-27 11:30:30 +02:00
committed by rubidium42
parent 31424f700e
commit c59d64c132
86 changed files with 575 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/console_gui.cpp
+9 -10
View File
@@ -41,10 +41,10 @@ static const uint ICON_BOTTOM_BORDERWIDTH = 12;
*/
struct IConsoleLine {
std::string buffer; ///< The data to store.
TextColour colour; ///< The colour of the line.
ExtendedTextColour colour; ///< The colour of the line.
uint16_t time; ///< The amount of time the line is in the backlog.
IConsoleLine() : buffer(), colour(TC_BEGIN), time(0)
IConsoleLine() : buffer(), colour(TextColour::Begin), time(0)
{
}
@@ -54,7 +54,7 @@ struct IConsoleLine {
* @param buffer the data to print.
* @param colour the colour of the line.
*/
IConsoleLine(std::string buffer, TextColour colour) :
IConsoleLine(std::string buffer, ExtendedTextColour colour) :
buffer(std::move(buffer)),
colour(colour),
time(0)
@@ -216,7 +216,7 @@ struct IConsoleWindow : Window
DrawString(this->line_offset + delta, right, this->height - this->line_height, _iconsole_cmdline.GetText(), static_cast<TextColour>(CC_COMMAND), SA_LEFT | SA_FORCE);
if (_focused_window == this && _iconsole_cmdline.caret) {
DrawString(this->line_offset + delta + _iconsole_cmdline.caretxoffs, right, this->height - this->line_height, "_", TC_WHITE, SA_LEFT | SA_FORCE);
DrawString(this->line_offset + delta + _iconsole_cmdline.caretxoffs, right, this->height - this->line_height, "_", TextColour::White, SA_LEFT | SA_FORCE);
}
}
@@ -388,7 +388,7 @@ void IConsoleGUIInit()
IConsoleClearBuffer();
IConsolePrint(TC_LIGHT_BLUE, "OpenTTD Game Console Revision 7 - {}", _openttd_revision);
IConsolePrint(TextColour::LightBlue, "OpenTTD Game Console Revision 7 - {}", _openttd_revision);
IConsolePrint(CC_WHITE, "------------------------------------");
IConsolePrint(CC_WHITE, "use \"help\" for more information.");
IConsolePrint(CC_WHITE, "");
@@ -499,7 +499,7 @@ static void IConsoleHistoryNavigate(int direction)
* @param colour_code the colour of the command. Red in case of errors, etc.
* @param str the message entered or output on the console (notice, error, etc.)
*/
void IConsoleGUIPrint(TextColour colour_code, const std::string &str)
void IConsoleGUIPrint(ExtendedTextColour colour_code, const std::string &str)
{
_iconsole_buffer.push_front(IConsoleLine(str, colour_code));
SetWindowDirty(WC_CONSOLE, 0);
@@ -539,16 +539,15 @@ static bool TruncateBuffer()
* @param c The text colour to compare to.
* @return true iff the TextColour is valid for console usage.
*/
bool IsValidConsoleColour(TextColour c)
bool IsValidConsoleColour(ExtendedTextColour c)
{
/* A normal text colour is used. */
if (!(c & TC_IS_PALETTE_COLOUR)) return TC_BEGIN <= c && c < TC_END;
if (!c.flags.Test(ExtendedTextColourFlag::IsPaletteColour)) return TextColour::Begin <= c.colour && c.colour < TextColour::End;
/* A text colour from the palette is used; must be the company
* colour gradient, so it must be one of those. */
c &= ~TC_IS_PALETTE_COLOUR;
for (Colours i = Colours::Begin; i < Colours::End; i++) {
if (GetColourGradient(i, Shade::Normal).p == c) return true;
if (ExtendedTextColour{GetColourGradient(i, Shade::Normal)} == c) return true;
}
return false;