mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #16015 from duncanspumpkin/clang-tidy4

This commit is contained in:
Tulio Leao 2022-03-18 01:01:45 -03:00 committed by GitHub
parent 93d13552a9 397bc51e68
commit 5408d053ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/UiContext.cpp
View File

@ -172,12 +172,12 @@ public:
void SetFullscreenMode(FULLSCREEN_MODE mode) override
{
static constexpr const int32_t SDLFSFlags[] = {
static constexpr const int32_t _sdlFullscreenFlags[] = {
0,
SDL_WINDOW_FULLSCREEN,
SDL_WINDOW_FULLSCREEN_DESKTOP,
};
uint32_t windowFlags = SDLFSFlags[static_cast<int32_t>(mode)];
uint32_t windowFlags = _sdlFullscreenFlags[static_cast<int32_t>(mode)];
// HACK Changing window size when in fullscreen usually has no effect
if (mode == FULLSCREEN_MODE::FULLSCREEN)

4
src/openrct2-ui/input/MouseInput.cpp
View File

@ -1377,7 +1377,7 @@ void InputStateWidgetPressed(
gDropdownLastColourHover = dropdown_index;
WindowTooltipClose();
static constexpr const rct_string_id colourTooltips[] = {
static constexpr const rct_string_id _colourTooltips[] = {
STR_COLOUR_BLACK_TIP,
STR_COLOUR_GREY_TIP,
STR_COLOUR_WHITE_TIP,
@ -1411,7 +1411,7 @@ void InputStateWidgetPressed(
STR_COLOUR_BRIGHT_PINK_TIP,
STR_COLOUR_LIGHT_PINK_TIP,
};
WindowTooltipShow(OpenRCT2String{ colourTooltips[dropdown_index], {} }, screenCoords);
WindowTooltipShow(OpenRCT2String{ _colourTooltips[dropdown_index], {} }, screenCoords);
}
if (dropdown_index < Dropdown::ItemsMaxSize && Dropdown::IsDisabled(dropdown_index))

12
src/openrct2-ui/input/ShortcutInput.cpp
View File

@ -189,7 +189,7 @@ ShortcutInput::ShortcutInput(std::string_view value)
std::string_view ShortcutInput::GetModifierName(uint32_t key, bool localised)
{
static std::unordered_map<uint32_t, std::pair<const char*, rct_string_id>> keys{
static std::unordered_map<uint32_t, std::pair<const char*, rct_string_id>> _keys{
{ KMOD_SHIFT, { "SHIFT", STR_SHORTCUT_MOD_SHIFT } }, { KMOD_LSHIFT, { "LSHIFT", STR_SHORTCUT_MOD_LSHIFT } },
{ KMOD_RSHIFT, { "RSHIFT", STR_SHORTCUT_MOD_RSHIFT } }, { KMOD_CTRL, { "CTRL", STR_SHORTCUT_MOD_CTRL } },
{ KMOD_LCTRL, { "LCTRL", STR_SHORTCUT_MOD_LCTRL } }, { KMOD_RCTRL, { "RCTRL", STR_SHORTCUT_MOD_RCTRL } },
@ -198,8 +198,8 @@ std::string_view ShortcutInput::GetModifierName(uint32_t key, bool localised)
{ KMOD_LGUI, { "LGUI", STR_SHORTCUT_MOD_LGUI } }, { KMOD_RGUI, { "RGUI", STR_SHORTCUT_MOD_RGUI } },
};
auto r = keys.find(key);
if (r != keys.end())
auto r = _keys.find(key);
if (r != _keys.end())
{
if (localised && r->second.second != STR_NONE)
{
@ -214,7 +214,7 @@ std::string_view ShortcutInput::GetModifierName(uint32_t key, bool localised)
std::string_view ShortcutInput::GetLocalisedKeyName(uint32_t key)
{
static std::unordered_map<uint32_t, rct_string_id> keys{
static std::unordered_map<uint32_t, rct_string_id> _keys{
{ SDLK_LEFT, STR_SHORTCUT_LEFT },
{ SDLK_RIGHT, STR_SHORTCUT_RIGHT },
{ SDLK_UP, STR_SHORTCUT_UP },
@ -247,8 +247,8 @@ std::string_view ShortcutInput::GetLocalisedKeyName(uint32_t key)
{ SDLK_CAPSLOCK, STR_SHORTCUT_NUMPAD_PERIOD },
};
auto r = keys.find(key);
if (r != keys.end())
auto r = _keys.find(key);
if (r != _keys.end())
{
return language_get_string(r->second);
}

4
src/openrct2-ui/input/ShortcutManager.cpp
View File

@ -354,7 +354,7 @@ void ShortcutManager::SaveUserBindings(const fs::path& path)
std::string_view ShortcutManager::GetLegacyShortcutId(size_t index)
{
static constexpr std::string_view LegacyMap[] = {
static constexpr std::string_view _legacyMap[] = {
ShortcutId::InterfaceCloseTop,
ShortcutId::InterfaceCloseAll,
ShortcutId::InterfaceCancelConstruction,
@ -441,5 +441,5 @@ std::string_view ShortcutManager::GetLegacyShortcutId(size_t index)
ShortcutId::WindowTileInspectorDecreaseHeight,
ShortcutId::InterfaceDisableClearance,
};
return index < std::size(LegacyMap) ? LegacyMap[index] : std::string_view();
return index < std::size(_legacyMap) ? _legacyMap[index] : std::string_view();
}

10
src/openrct2-ui/interface/InGameConsole.cpp
View File

@ -280,11 +280,11 @@ void InGameConsole::Draw(rct_drawpixelinfo* dpi) const
// This is something of a hack to ensure the text is actually black
// as opposed to a desaturated grey
thread_local std::string colourFormatStr;
colourFormatStr.clear();
thread_local std::string _colourFormatStr;
_colourFormatStr.clear();
if (textColour == COLOUR_BLACK)
{
colourFormatStr = "{BLACK}";
_colourFormatStr = "{BLACK}";
}
// TTF looks far better without the outlines
@ -317,7 +317,7 @@ void InGameConsole::Draw(rct_drawpixelinfo* dpi) const
for (std::size_t i = 0; i < _consoleLines.size() && i < static_cast<size_t>(maxLines); i++)
{
const size_t index = i + _consoleScrollPos;
lineBuffer = colourFormatStr + _consoleLines[index];
lineBuffer = _colourFormatStr + _consoleLines[index];
gfx_draw_string(dpi, screenCoords, lineBuffer.c_str(), { textColour, InGameConsoleGetFontSpriteBase() });
screenCoords.y += lineHeight;
}
@ -325,7 +325,7 @@ void InGameConsole::Draw(rct_drawpixelinfo* dpi) const
screenCoords.y = _consoleBottomRight.y - lineHeight - CONSOLE_EDGE_PADDING - 1;
// Draw current line
lineBuffer = colourFormatStr + _consoleCurrentLine;
lineBuffer = _colourFormatStr + _consoleCurrentLine;
gfx_draw_string_no_formatting(dpi, screenCoords, lineBuffer.c_str(), { TEXT_COLOUR_255, InGameConsoleGetFontSpriteBase() });
// Draw caret

38
src/openrct2-ui/windows/Cheats.cpp
View File

@ -512,8 +512,8 @@ public:
DrawWidgets(dpi);
DrawTabImages(dpi);
static constexpr int16_t X_LCOL = 14;
static constexpr int16_t X_RCOL = 208;
static constexpr int16_t _xLcol = 14;
static constexpr int16_t _xRcol = 208;
if (page == WINDOW_CHEATS_PAGE_MONEY)
{
@ -525,28 +525,28 @@ public:
colour |= COLOUR_FLAG_INSET;
}
int32_t actual_month = _monthSpinnerValue - 1;
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ X_LCOL, 93 }, STR_BOTTOM_TOOLBAR_CASH, ft, { colour });
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ X_LCOL, 198 }, STR_YEAR);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ X_LCOL, 219 }, STR_MONTH);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ X_LCOL, 240 }, STR_DAY);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ _xLcol, 93 }, STR_BOTTOM_TOOLBAR_CASH, ft, { colour });
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ _xLcol, 198 }, STR_YEAR);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ _xLcol, 219 }, STR_MONTH);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ _xLcol, 240 }, STR_DAY);
ft = Formatter();
ft.Add<int32_t>(_yearSpinnerValue);
DrawTextBasic(
&dpi, windowPos + ScreenCoordsXY{ X_RCOL, 198 }, STR_FORMAT_INTEGER, ft, { colours[1], TextAlignment::RIGHT });
&dpi, windowPos + ScreenCoordsXY{ _xRcol, 198 }, STR_FORMAT_INTEGER, ft, { colours[1], TextAlignment::RIGHT });
ft = Formatter();
ft.Add<int32_t>(actual_month);
DrawTextBasic(
&dpi, windowPos + ScreenCoordsXY{ X_RCOL, 219 }, STR_FORMAT_MONTH, ft, { colours[1], TextAlignment::RIGHT });
&dpi, windowPos + ScreenCoordsXY{ _xRcol, 219 }, STR_FORMAT_MONTH, ft, { colours[1], TextAlignment::RIGHT });
ft = Formatter();
ft.Add<int32_t>(_daySpinnerValue);
DrawTextBasic(
&dpi, windowPos + ScreenCoordsXY{ X_RCOL, 240 }, STR_FORMAT_INTEGER, ft, { colours[1], TextAlignment::RIGHT });
&dpi, windowPos + ScreenCoordsXY{ _xRcol, 240 }, STR_FORMAT_INTEGER, ft, { colours[1], TextAlignment::RIGHT });
}
else if (page == WINDOW_CHEATS_PAGE_MISC)
{
{
auto& widget = widgets[WIDX_WEATHER];
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ X_LCOL - 3, widget.top + 1 }, STR_CHANGE_WEATHER);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ _xLcol - 3, widget.top + 1 }, STR_CHANGE_WEATHER);
}
{
@ -561,19 +561,19 @@ public:
{
auto& widget = widgets[WIDX_STAFF_SPEED];
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ X_LCOL - 3, widget.top + 1 }, STR_CHEAT_STAFF_SPEED);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ _xLcol - 3, widget.top + 1 }, STR_CHEAT_STAFF_SPEED);
}
}
else if (page == WINDOW_CHEATS_PAGE_GUESTS)
{
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ X_LCOL, 72 }, STR_CHEAT_GUEST_HAPPINESS);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ X_LCOL, 93 }, STR_CHEAT_GUEST_ENERGY);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ X_LCOL, 114 }, STR_CHEAT_GUEST_HUNGER);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ X_LCOL, 135 }, STR_CHEAT_GUEST_THIRST);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ X_LCOL, 156 }, STR_CHEAT_GUEST_NAUSEA);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ X_LCOL, 177 }, STR_CHEAT_GUEST_NAUSEA_TOLERANCE);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ X_LCOL, 198 }, STR_CHEAT_GUEST_TOILET);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ X_LCOL, 219 }, STR_CHEAT_GUEST_PREFERRED_INTENSITY);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ _xLcol, 72 }, STR_CHEAT_GUEST_HAPPINESS);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ _xLcol, 93 }, STR_CHEAT_GUEST_ENERGY);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ _xLcol, 114 }, STR_CHEAT_GUEST_HUNGER);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ _xLcol, 135 }, STR_CHEAT_GUEST_THIRST);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ _xLcol, 156 }, STR_CHEAT_GUEST_NAUSEA);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ _xLcol, 177 }, STR_CHEAT_GUEST_NAUSEA_TOLERANCE);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ _xLcol, 198 }, STR_CHEAT_GUEST_TOILET);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ _xLcol, 219 }, STR_CHEAT_GUEST_PREFERRED_INTENSITY);
}
}

8
src/openrct2-ui/windows/GameBottomToolbar.cpp
View File

@ -416,13 +416,13 @@ static void WindowGameBottomToolbarDrawLeftPanel(rct_drawpixelinfo* dpi, rct_win
DrawTextBasic(dpi, screenCoords, stringId, ft, { colour, TextAlignment::CENTRE });
}
static constexpr const rct_string_id guestCountFormats[] = {
static constexpr const rct_string_id _guestCountFormats[] = {
STR_BOTTOM_TOOLBAR_NUM_GUESTS_STABLE,
STR_BOTTOM_TOOLBAR_NUM_GUESTS_DECREASE,
STR_BOTTOM_TOOLBAR_NUM_GUESTS_INCREASE,
};
static constexpr const rct_string_id guestCountFormatsSingular[] = {
static constexpr const rct_string_id _guestCountFormatsSingular[] = {
STR_BOTTOM_TOOLBAR_NUM_GUESTS_STABLE_SINGULAR,
STR_BOTTOM_TOOLBAR_NUM_GUESTS_DECREASE_SINGULAR,
STR_BOTTOM_TOOLBAR_NUM_GUESTS_INCREASE_SINGULAR,
@ -433,8 +433,8 @@ static void WindowGameBottomToolbarDrawLeftPanel(rct_drawpixelinfo* dpi, rct_win
rct_widget widget = window_game_bottom_toolbar_widgets[WIDX_GUESTS];
auto screenCoords = ScreenCoordsXY{ w->windowPos.x + widget.midX(), w->windowPos.y + widget.midY() - 6 };
rct_string_id stringId = gNumGuestsInPark == 1 ? guestCountFormatsSingular[gGuestChangeModifier]
: guestCountFormats[gGuestChangeModifier];
rct_string_id stringId = gNumGuestsInPark == 1 ? _guestCountFormatsSingular[gGuestChangeModifier]
: _guestCountFormats[gGuestChangeModifier];
colour_t colour
= (gHoverWidget.window_classification == WC_BOTTOM_TOOLBAR && gHoverWidget.widget_index == WIDX_GUESTS
? COLOUR_WHITE

4
src/openrct2-ui/windows/Guest.cpp
View File

@ -1376,7 +1376,7 @@ void WindowGuestStatsPaint(rct_window* w, rct_drawpixelinfo* dpi)
// Nausea tolerance
{
static constexpr const rct_string_id nauseaTolerances[] = {
static constexpr const rct_string_id _nauseaTolerances[] = {
STR_PEEP_STAT_NAUSEA_TOLERANCE_NONE,
STR_PEEP_STAT_NAUSEA_TOLERANCE_LOW,
STR_PEEP_STAT_NAUSEA_TOLERANCE_AVERAGE,
@ -1385,7 +1385,7 @@ void WindowGuestStatsPaint(rct_window* w, rct_drawpixelinfo* dpi)
screenCoords.y += LIST_ROW_HEIGHT;
auto nausea_tolerance = EnumValue(peep->NauseaTolerance) & 0x3;
auto ft = Formatter();
ft.Add<rct_string_id>(nauseaTolerances[nausea_tolerance]);
ft.Add<rct_string_id>(_nauseaTolerances[nausea_tolerance]);
DrawTextBasic(dpi, screenCoords, STR_GUEST_STAT_NAUSEA_TOLERANCE, ft);
}
}

8
src/openrct2-ui/windows/LoadSave.cpp
View File

@ -700,12 +700,12 @@ static void WindowLoadsavePaint(rct_window* w, rct_drawpixelinfo* dpi)
}
// Format text
thread_local std::string buffer;
buffer.assign("{BLACK}");
buffer += _shortenedDirectory;
thread_local std::string _buffer;
_buffer.assign("{BLACK}");
_buffer += _shortenedDirectory;
// Draw path text
const auto normalisedPath = Platform::StrDecompToPrecomp(buffer.data());
const auto normalisedPath = Platform::StrDecompToPrecomp(_buffer.data());
const auto* normalisedPathC = normalisedPath.c_str();
auto ft = Formatter();
ft.Add<const char*>(normalisedPathC);

4
src/openrct2-ui/windows/Map.cpp
View File

@ -844,7 +844,7 @@ public:
{
screenCoords = windowPos + ScreenCoordsXY{ 4, widgets[WIDX_MAP].bottom + 2 };
static rct_string_id mapLabels[] = {
static constexpr rct_string_id _mapLabels[] = {
STR_MAP_RIDE, STR_MAP_FOOD_STALL, STR_MAP_DRINK_STALL, STR_MAP_SOUVENIR_STALL,
STR_MAP_INFO_KIOSK, STR_MAP_FIRST_AID, STR_MAP_CASH_MACHINE, STR_MAP_TOILET,
};
@ -854,7 +854,7 @@ public:
gfx_fill_rect(
&dpi, { screenCoords + ScreenCoordsXY{ 0, 2 }, screenCoords + ScreenCoordsXY{ 6, 8 } },
RideKeyColours[i]);
DrawTextBasic(&dpi, screenCoords + ScreenCoordsXY{ LIST_ROW_HEIGHT, 0 }, mapLabels[i], {});
DrawTextBasic(&dpi, screenCoords + ScreenCoordsXY{ LIST_ROW_HEIGHT, 0 }, _mapLabels[i], {});
screenCoords.y += LIST_ROW_HEIGHT;
if (i == 3)
{

54
src/openrct2-ui/windows/Multiplayer.cpp
View File

@ -586,9 +586,9 @@ static void WindowMultiplayerPlayersScrollpaint(rct_window* w, rct_drawpixelinfo
if (screenCoords.y + SCROLLABLE_ROW_HEIGHT + 1 >= dpi->y)
{
thread_local std::string buffer;
buffer.reserve(512);
buffer.clear();
thread_local std::string _buffer;
_buffer.reserve(512);
_buffer.clear();
// Draw player name
colour_t colour = COLOUR_BLACK;
@ -597,35 +597,35 @@ static void WindowMultiplayerPlayersScrollpaint(rct_window* w, rct_drawpixelinfo
gfx_filter_rect(
dpi, { 0, screenCoords.y, 800, screenCoords.y + SCROLLABLE_ROW_HEIGHT - 1 },
FilterPaletteID::PaletteDarken1);
buffer += network_get_player_name(i);
_buffer += network_get_player_name(i);
colour = w->colours[2];
}
else
{
if (network_get_player_flags(i) & NETWORK_PLAYER_FLAG_ISSERVER)
{
buffer += "{BABYBLUE}";
_buffer += "{BABYBLUE}";
}
else
{
buffer += "{BLACK}";
_buffer += "{BLACK}";
}
buffer += network_get_player_name(i);
_buffer += network_get_player_name(i);
}
screenCoords.x = 0;
gfx_clip_string(buffer.data(), 230, FontSpriteBase::MEDIUM);
gfx_draw_string(dpi, screenCoords, buffer.c_str(), { colour });
gfx_clip_string(_buffer.data(), 230, FontSpriteBase::MEDIUM);
gfx_draw_string(dpi, screenCoords, _buffer.c_str(), { colour });
// Draw group name
buffer.resize(0);
_buffer.resize(0);
int32_t group = network_get_group_index(network_get_player_group(i));
if (group != -1)
{
buffer += "{BLACK}";
_buffer += "{BLACK}";
screenCoords.x = 173;
buffer += network_get_group_name(group);
gfx_clip_string(buffer.data(), 80, FontSpriteBase::MEDIUM);
gfx_draw_string(dpi, screenCoords, buffer.c_str(), { colour });
_buffer += network_get_group_name(group);
gfx_clip_string(_buffer.data(), 80, FontSpriteBase::MEDIUM);
gfx_draw_string(dpi, screenCoords, _buffer.c_str(), { colour });
}
// Draw last action
@ -642,27 +642,27 @@ static void WindowMultiplayerPlayersScrollpaint(rct_window* w, rct_drawpixelinfo
DrawTextEllipsised(dpi, { 256, screenCoords.y }, 100, STR_BLACK_STRING, ft);
// Draw ping
buffer.resize(0);
_buffer.resize(0);
int32_t ping = network_get_player_ping(i);
if (ping <= 100)
{
buffer += "{GREEN}";
_buffer += "{GREEN}";
}
else if (ping <= 250)
{
buffer += "{YELLOW}";
_buffer += "{YELLOW}";
}
else
{
buffer += "{RED}";
_buffer += "{RED}";
}
char pingBuffer[64]{};
snprintf(pingBuffer, sizeof(pingBuffer), "%d ms", ping);
buffer += pingBuffer;
_buffer += pingBuffer;
screenCoords.x = 356;
gfx_draw_string(dpi, screenCoords, buffer.c_str(), { colour });
gfx_draw_string(dpi, screenCoords, _buffer.c_str(), { colour });
}
screenCoords.y += SCROLLABLE_ROW_HEIGHT;
}
@ -840,7 +840,7 @@ static void WindowMultiplayerGroupsInvalidate(rct_window* w)
static void WindowMultiplayerGroupsPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
thread_local std::string buffer;
thread_local std::string _buffer;
WindowDrawWidgets(w, dpi);
WindowMultiplayerDrawTabImages(w, dpi);
@ -849,11 +849,11 @@ static void WindowMultiplayerGroupsPaint(rct_window* w, rct_drawpixelinfo* dpi)
int32_t group = network_get_group_index(network_get_default_group());
if (group != -1)
{
buffer.assign("{WINDOW_COLOUR_2}");
buffer += network_get_group_name(group);
_buffer.assign("{WINDOW_COLOUR_2}");
_buffer += network_get_group_name(group);
auto ft = Formatter();
ft.Add<const char*>(buffer.c_str());
ft.Add<const char*>(_buffer.c_str());
DrawTextEllipsised(
dpi, w->windowPos + ScreenCoordsXY{ widget->midX() - 5, widget->top }, widget->width() - 8, STR_STRING, ft,
{ TextAlignment::CENTRE });
@ -875,10 +875,10 @@ static void WindowMultiplayerGroupsPaint(rct_window* w, rct_drawpixelinfo* dpi)
group = network_get_group_index(_selectedGroup);
if (group != -1)
{
buffer.assign("{WINDOW_COLOUR_2}");
buffer += network_get_group_name(group);
_buffer.assign("{WINDOW_COLOUR_2}");
_buffer += network_get_group_name(group);
auto ft = Formatter();
ft.Add<const char*>(buffer.c_str());
ft.Add<const char*>(_buffer.c_str());
DrawTextEllipsised(
dpi, w->windowPos + ScreenCoordsXY{ widget->midX() - 5, widget->top }, widget->width() - 8, STR_STRING, ft,
{ TextAlignment::CENTRE });

12
src/openrct2-ui/windows/NetworkStatus.cpp
View File

@ -155,11 +155,11 @@ static void WindowNetworkStatusPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
thread_local std::string buffer;
buffer.assign("{BLACK}");
buffer += window_network_status_text;
gfx_clip_string(buffer.data(), w->widgets[WIDX_BACKGROUND].right - 50, FontSpriteBase::MEDIUM);
thread_local std::string _buffer;
_buffer.assign("{BLACK}");
_buffer += window_network_status_text;
gfx_clip_string(_buffer.data(), w->widgets[WIDX_BACKGROUND].right - 50, FontSpriteBase::MEDIUM);
ScreenCoordsXY screenCoords(w->windowPos.x + (w->width / 2), w->windowPos.y + (w->height / 2));
screenCoords.x -= gfx_get_string_width(buffer, FontSpriteBase::MEDIUM) / 2;
gfx_draw_string(dpi, screenCoords, buffer.c_str());
screenCoords.x -= gfx_get_string_width(_buffer, FontSpriteBase::MEDIUM) / 2;
gfx_draw_string(dpi, screenCoords, _buffer.c_str());
}

4
src/openrct2-ui/windows/Options.cpp
View File

@ -1026,13 +1026,13 @@ private:
SetCheckboxValue(WIDX_TRANSPARENT_SCREENSHOTS_CHECKBOX, gConfigGeneral.transparent_screenshot);
SetCheckboxValue(WIDX_UPPER_CASE_BANNERS_CHECKBOX, gConfigGeneral.upper_case_banners);
static constexpr rct_string_id VirtualFloorStyleStrings[] = {
static constexpr rct_string_id _virtualFloorStyleStrings[] = {
STR_VIRTUAL_FLOOR_STYLE_DISABLED,
STR_VIRTUAL_FLOOR_STYLE_TRANSPARENT,
STR_VIRTUAL_FLOOR_STYLE_GLASSY,
};
widgets[WIDX_VIRTUAL_FLOOR].text = VirtualFloorStyleStrings[static_cast<int32_t>(gConfigGeneral.virtual_floor_style)];
widgets[WIDX_VIRTUAL_FLOOR].text = _virtualFloorStyleStrings[static_cast<int32_t>(gConfigGeneral.virtual_floor_style)];
SetCheckboxValue(WIDX_ENABLE_LIGHT_FX_CHECKBOX, gConfigGeneral.enable_light_fx);
if (gConfigGeneral.day_night_cycle && gConfigGeneral.drawing_engine == DrawingEngine::SoftwareWithHardwareDisplay)

8
src/openrct2-ui/windows/Player.cpp
View File

@ -318,11 +318,11 @@ void WindowPlayerOverviewPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
rct_widget* widget = &window_player_overview_widgets[WIDX_GROUP];
thread_local std::string buffer;
buffer.assign("{WINDOW_COLOUR_2}");
buffer += network_get_group_name(groupindex);
thread_local std::string _buffer;
_buffer.assign("{WINDOW_COLOUR_2}");
_buffer += network_get_group_name(groupindex);
auto ft = Formatter();
ft.Add<const char*>(buffer.c_str());
ft.Add<const char*>(_buffer.c_str());
DrawTextEllipsised(
dpi, w->windowPos + ScreenCoordsXY{ widget->midX() - 5, widget->top }, widget->width() - 8, STR_STRING, ft,

4
src/openrct2-ui/windows/TileInspector.cpp
View File

@ -1988,14 +1988,14 @@ static void WindowTileInspectorPaint(rct_window* w, rct_drawpixelinfo* dpi)
if (sceneryEntry != nullptr && !(sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_FULL_TILE)))
{
int16_t quadrant = tileElement->AsSmallScenery()->GetSceneryQuadrant();
static constexpr rct_string_id quadrant_string_idx[] = {
static constexpr rct_string_id _quadrantStringIdx[] = {
STR_TILE_INSPECTOR_SCENERY_QUADRANT_SW,
STR_TILE_INSPECTOR_SCENERY_QUADRANT_NW,
STR_TILE_INSPECTOR_SCENERY_QUADRANT_NE,
STR_TILE_INSPECTOR_SCENERY_QUADRANT_SE,
};
ft = Formatter();
ft.Add<rct_string_id>(quadrant_string_idx[quadrant]);
ft.Add<rct_string_id>(_quadrantStringIdx[quadrant]);
DrawTextBasic(
dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_SCENERY_QUADRANT, ft,
{ w->colours[1] });

4
src/openrct2-ui/windows/TopToolbar.cpp
View File

@ -841,14 +841,14 @@ static void WindowTopToolbarInvalidate(rct_window* w)
// Set map button to the right image.
if (window_top_toolbar_widgets[WIDX_MAP].type != WindowWidgetType::Empty)
{
static constexpr uint32_t imageIdByRotation[] = {
static constexpr uint32_t _imageIdByRotation[] = {
SPR_G2_MAP_NORTH,
SPR_G2_MAP_WEST,
SPR_G2_MAP_SOUTH,
SPR_G2_MAP_EAST,
};
uint32_t mapImageId = imageIdByRotation[get_current_rotation()];
uint32_t mapImageId = _imageIdByRotation[get_current_rotation()];
window_top_toolbar_widgets[WIDX_MAP].image = IMAGE_TYPE_REMAP | mapImageId;
}