mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

Prepend _ to private member fields

Browse Source
This commit is contained in:
Daniel Karandikar
2021-03-22 18:56:24 +00:00
parent 1229ce6b22
commit 248d6a0683
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/openrct2-ui/windows/Banner.cpp
View File

@@ -74,16 +74,16 @@ static rct_widget window_banner_widgets[] = {
class BannerWindow final : public Window
{
private:
Banner* banner;
CoordsXYZ bannerViewPos;
TileElement* tileElement = nullptr;
Banner* _banner;
CoordsXYZ _bannerViewPos;
TileElement* _tileElement = nullptr;
void CreateViewport()
{
rct_widget* viewportWidget = &window_banner_widgets[WIDX_VIEWPORT];
viewport_create(
this, windowPos + ScreenCoordsXY{ viewportWidget->left + 1, viewportWidget->top + 1 },
(viewportWidget->width()) - 1, (viewportWidget->height()) - 1, 0, bannerViewPos, 0, SPRITE_INDEX_NULL);
(viewportWidget->width()) - 1, (viewportWidget->height()) - 1, 0, _bannerViewPos, 0, SPRITE_INDEX_NULL);
if (viewport != nullptr)
viewport->flags = gConfigGeneral.always_show_gridlines ? VIEWPORT_FLAG_GRIDLINES : 0;
@@ -92,10 +92,10 @@ private:
void InitTileElement()
{
TileElement* tile_element = map_get_first_element_at(banner->position.ToCoordsXY().ToTileCentre());
TileElement* tile_element = map_get_first_element_at(_banner->position.ToCoordsXY().ToTileCentre());
if (tile_element == nullptr)
{
tileElement = nullptr;
_tileElement = nullptr;
return;
}
@@ -105,7 +105,7 @@ private:
break;
tile_element++;
}
tileElement = tile_element;
_tileElement = tile_element;
}
public:
@@ -121,14 +121,14 @@ public:
BannerWindow* Initialise(rct_windownumber _number)
{
number = _number;
banner = GetBanner(number);
_banner = GetBanner(number);
InitTileElement();
if (tileElement == nullptr)
if (_tileElement == nullptr)
return nullptr;
frame_no = tileElement->GetBaseZ();
bannerViewPos = CoordsXYZ{ banner->position.ToCoordsXY().ToTileCentre(), frame_no };
frame_no = _tileElement->GetBaseZ();
_bannerViewPos = CoordsXYZ{ _banner->position.ToCoordsXY().ToTileCentre(), frame_no };
CreateViewport();
return this;
@@ -141,7 +141,7 @@ public:
switch (widgetIndex)
{
case WIDX_MAIN_COLOUR:
WindowDropdownShowColour(this, widget, TRANSLUCENT(colours[1]), banner->colour);
WindowDropdownShowColour(this, widget, TRANSLUCENT(colours[1]), _banner->colour);
break;
case WIDX_TEXT_COLOUR_DROPDOWN_BUTTON:
@@ -158,7 +158,7 @@ public:
{ widget->left + windowPos.x, widget->top + windowPos.y }, widget->height() + 1, colours[1], 0,
Dropdown::Flag::StayOpen, 13, widget->width() - 3);
Dropdown::SetChecked(banner->text_colour - 1, true);
Dropdown::SetChecked(_banner->text_colour - 1, true);
break;
}
}
@@ -173,19 +173,19 @@ public:
case WIDX_BANNER_DEMOLISH:
{
auto bannerRemoveAction = BannerRemoveAction(
{ banner->position.ToCoordsXY(), tileElement->GetBaseZ(), tileElement->AsBanner()->GetPosition() });
{ _banner->position.ToCoordsXY(), _tileElement->GetBaseZ(), _tileElement->AsBanner()->GetPosition() });
GameActions::Execute(&bannerRemoveAction);
break;
}
case WIDX_BANNER_TEXT:
window_text_input_raw_open(
this, WIDX_BANNER_TEXT, STR_BANNER_TEXT, STR_ENTER_BANNER_TEXT, banner->GetText().c_str(), 32);
this, WIDX_BANNER_TEXT, STR_BANNER_TEXT, STR_ENTER_BANNER_TEXT, _banner->GetText().c_str(), 32);
break;
case WIDX_BANNER_NO_ENTRY:
{
textinput_cancel();
auto bannerSetStyle = BannerSetStyleAction(
BannerSetStyleType::NoEntry, number, banner->flags ^ BANNER_FLAG_NO_ENTRY);
BannerSetStyleType::NoEntry, number, _banner->flags ^ BANNER_FLAG_NO_ENTRY);
GameActions::Execute(&bannerSetStyle);
break;
}
@@ -246,7 +246,7 @@ public:
rct_widget* colour_btn = &window_banner_widgets[WIDX_MAIN_COLOUR];
colour_btn->type = WindowWidgetType::Empty;
// Scenery item not sure why we use this instead of banner?
rct_scenery_entry* sceneryEntry = get_banner_entry(banner->type);
rct_scenery_entry* sceneryEntry = get_banner_entry(_banner->type);
if (sceneryEntry != nullptr && (sceneryEntry->banner.flags & BANNER_ENTRY_FLAG_HAS_PRIMARY_COLOUR))
{
colour_btn->type = WindowWidgetType::ColourBtn;
@@ -254,15 +254,15 @@ public:
pressed_widgets &= ~(1ULL << WIDX_BANNER_NO_ENTRY);
disabled_widgets &= ~(
(1ULL << WIDX_BANNER_TEXT) | (1ULL << WIDX_TEXT_COLOUR_DROPDOWN) | (1ULL << WIDX_TEXT_COLOUR_DROPDOWN_BUTTON));
if (banner->flags & BANNER_FLAG_NO_ENTRY)
if (_banner->flags & BANNER_FLAG_NO_ENTRY)
{
pressed_widgets |= (1ULL << WIDX_BANNER_NO_ENTRY);
disabled_widgets |= (1ULL << WIDX_BANNER_TEXT) | (1ULL << WIDX_TEXT_COLOUR_DROPDOWN)
| (1ULL << WIDX_TEXT_COLOUR_DROPDOWN_BUTTON);
}
colour_btn->image = SPRITE_ID_PALETTE_COLOUR_1(banner->colour) | IMAGE_TYPE_TRANSPARENT | SPR_PALETTE_BTN;
colour_btn->image = SPRITE_ID_PALETTE_COLOUR_1(_banner->colour) | IMAGE_TYPE_TRANSPARENT | SPR_PALETTE_BTN;
rct_widget* drop_down_widget = &window_banner_widgets[WIDX_TEXT_COLOUR_DROPDOWN];
drop_down_widget->text = BannerColouredTextFormats[banner->text_colour];
drop_down_widget->text = BannerColouredTextFormats[_banner->text_colour];
}
};