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

Part of #20526: Modified variable names

This commit is contained in:
Aram Kazorian 2023-07-02 12:08:54 -07:00
parent 2bb24d5d1a
commit 93a81309aa
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@ -135,7 +135,8 @@ static uint64_t window_editor_objective_options_page_hold_down_widgets[] = {
class EditorObjectiveOptionsWindow final : public Window class EditorObjectiveOptionsWindow final : public Window
{ {
private: private:
std::vector<RideId> _riddenRides; // Not shops or facilities
std::vector<RideId> _rideableRides;
public: public:
void OnOpen() override void OnOpen() override
@ -290,7 +291,7 @@ private:
page = newPage; page = newPage;
frame_no = 0; frame_no = 0;
_riddenRides.clear(); _rideableRides.clear();
selected_list_item = -1; selected_list_item = -1;
hold_down_widgets = window_editor_objective_options_page_hold_down_widgets[newPage]; hold_down_widgets = window_editor_objective_options_page_hold_down_widgets[newPage];
widgets = window_editor_objective_options_widgets[newPage]; widgets = window_editor_objective_options_widgets[newPage];
@ -1002,17 +1003,17 @@ private:
OnResize(); OnResize();
InvalidateWidget(WIDX_TAB_2); InvalidateWidget(WIDX_TAB_2);
const auto oldSize = _riddenRides.size(); const auto oldSize = _rideableRides.size();
_riddenRides.clear(); _rideableRides.clear();
for (auto& currentRide : GetRideManager()) for (auto& currentRide : GetRideManager())
{ {
if (currentRide.IsRide()) if (currentRide.IsRide())
{ {
_riddenRides.push_back(currentRide.id); _rideableRides.push_back(currentRide.id);
} }
} }
if (oldSize != _riddenRides.size()) if (oldSize != _rideableRides.size())
{ {
Invalidate(); Invalidate();
} }
@ -1025,7 +1026,7 @@ private:
ScreenSize OnScrollGetSizeRides(int32_t scrollIndex) ScreenSize OnScrollGetSizeRides(int32_t scrollIndex)
{ {
ScreenSize newSize; ScreenSize newSize;
newSize.height = static_cast<int32_t>(_riddenRides.size()) * 10; newSize.height = static_cast<int32_t>(_rideableRides.size()) * 10;
return newSize; return newSize;
} }
@ -1037,10 +1038,10 @@ private:
void OnScrollMouseDownRides(int32_t scrollIndex, const ScreenCoordsXY& screenCoords) void OnScrollMouseDownRides(int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
{ {
auto i = screenCoords.y / 12; auto i = screenCoords.y / 12;
if (i < 0 || i >= static_cast<int32_t>(_riddenRides.size())) if (i < 0 || i >= static_cast<int32_t>(_rideableRides.size()))
return; return;
auto* currentRide = GetRide(_riddenRides[i]); auto* currentRide = GetRide(_rideableRides[i]);
if (currentRide != nullptr) if (currentRide != nullptr)
{ {
currentRide->lifecycle_flags ^= RIDE_LIFECYCLE_INDESTRUCTIBLE; currentRide->lifecycle_flags ^= RIDE_LIFECYCLE_INDESTRUCTIBLE;
@ -1057,7 +1058,7 @@ private:
int32_t i; int32_t i;
i = screenCoords.y / 12; i = screenCoords.y / 12;
if (i < 0 || i >= static_cast<int32_t>(_riddenRides.size())) if (i < 0 || i >= static_cast<int32_t>(_rideableRides.size()))
return; return;
if (selected_list_item != i) if (selected_list_item != i)
@ -1111,7 +1112,7 @@ private:
int32_t colour = ColourMapA[colours[1]].mid_light; int32_t colour = ColourMapA[colours[1]].mid_light;
GfxFillRect(dpi, { { dpi.x, dpi.y }, { dpi.x + dpi.width - 1, dpi.y + dpi.height - 1 } }, colour); GfxFillRect(dpi, { { dpi.x, dpi.y }, { dpi.x + dpi.width - 1, dpi.y + dpi.height - 1 } }, colour);
for (int32_t i = 0; i < static_cast<int32_t>(_riddenRides.size()); i++) for (int32_t i = 0; i < static_cast<int32_t>(_rideableRides.size()); i++)
{ {
int32_t y = i * 12; int32_t y = i * 12;
@ -1130,7 +1131,7 @@ private:
} }
// Checkbox mark // Checkbox mark
auto* currentRide = GetRide(_riddenRides[i]); auto* currentRide = GetRide(_rideableRides[i]);
if (currentRide != nullptr) if (currentRide != nullptr)
{ {
if (currentRide->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE) if (currentRide->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE)