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

Rename IS_SHOP to IS_SHOP_OR_FACILITY and use it for RideObject

This commit is contained in:
frutiemax 2022-07-31 12:45:41 -04:00 committed by Gymnasiast
parent 2d75858589
commit 6868b3dcaf
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
20 changed files with 29 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/NewCampaign.cpp
View File

@ -134,7 +134,7 @@ public:
if (curRide.status == RideStatus::Open) if (curRide.status == RideStatus::Open)
{ {
if (!curRide.GetRideTypeDescriptor().HasFlag( if (!curRide.GetRideTypeDescriptor().HasFlag(
RIDE_TYPE_FLAG_IS_SHOP | RIDE_TYPE_FLAG_SELLS_FOOD | RIDE_TYPE_FLAG_SELLS_DRINKS RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY | RIDE_TYPE_FLAG_SELLS_FOOD | RIDE_TYPE_FLAG_SELLS_DRINKS
| RIDE_TYPE_FLAG_IS_TOILET)) | RIDE_TYPE_FLAG_IS_TOILET))
{ {
RideList.push_back(curRide.id); RideList.push_back(curRide.id);

6
src/openrct2-ui/windows/Ride.cpp
View File

@ -1057,7 +1057,7 @@ static void WindowRideDisableTabs(rct_window* w)
disabled_tabs |= (1ULL << WIDX_TAB_5); // 0x100 disabled_tabs |= (1ULL << WIDX_TAB_5); // 0x100
} }
if (rtd.HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) if (rtd.HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
disabled_tabs |= (1ULL << WIDX_TAB_3 | 1ULL << WIDX_TAB_4 | 1ULL << WIDX_TAB_7); // 0x4C0 disabled_tabs |= (1ULL << WIDX_TAB_3 | 1ULL << WIDX_TAB_4 | 1ULL << WIDX_TAB_7); // 0x4C0
if (!rtd.HasFlag(RIDE_TYPE_FLAG_ALLOW_MUSIC)) if (!rtd.HasFlag(RIDE_TYPE_FLAG_ALLOW_MUSIC))
@ -4223,7 +4223,7 @@ static int32_t WindowRideHasTrackColour(Ride* ride, int32_t trackColour)
{ {
// Get station flags (shops don't have them) // Get station flags (shops don't have them)
auto stationObjFlags = 0; auto stationObjFlags = 0;
if (!ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) if (!ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
{ {
auto stationObj = ride->GetStationObject(); auto stationObj = ride->GetStationObject();
if (stationObj != nullptr) if (stationObj != nullptr)
@ -6930,7 +6930,7 @@ static void WindowRideCustomerInvalidate(rct_window* w)
ride->FormatNameTo(ft); ride->FormatNameTo(ft);
window_ride_customer_widgets[WIDX_SHOW_GUESTS_THOUGHTS].type = WindowWidgetType::FlatBtn; window_ride_customer_widgets[WIDX_SHOW_GUESTS_THOUGHTS].type = WindowWidgetType::FlatBtn;
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
{ {
window_ride_customer_widgets[WIDX_SHOW_GUESTS_ON_RIDE].type = WindowWidgetType::Empty; window_ride_customer_widgets[WIDX_SHOW_GUESTS_ON_RIDE].type = WindowWidgetType::Empty;
window_ride_customer_widgets[WIDX_SHOW_GUESTS_QUEUING].type = WindowWidgetType::Empty; window_ride_customer_widgets[WIDX_SHOW_GUESTS_QUEUING].type = WindowWidgetType::Empty;

6
src/openrct2-ui/windows/RideConstruction.cpp
View File

@ -1530,7 +1530,7 @@ public:
int32_t rideType = RideGetAlternativeType(currentRide); int32_t rideType = RideGetAlternativeType(currentRide);
hold_down_widgets = 0; hold_down_widgets = 0;
if (GetRideTypeDescriptor(rideType).HasFlag(RIDE_TYPE_FLAG_IS_SHOP) || !currentRide->HasStation()) if (GetRideTypeDescriptor(rideType).HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY) || !currentRide->HasStation())
{ {
widgets[WIDX_ENTRANCE_EXIT_GROUPBOX].type = WindowWidgetType::Empty; widgets[WIDX_ENTRANCE_EXIT_GROUPBOX].type = WindowWidgetType::Empty;
widgets[WIDX_ENTRANCE].type = WindowWidgetType::Empty; widgets[WIDX_ENTRANCE].type = WindowWidgetType::Empty;
@ -2356,7 +2356,7 @@ private:
// When flat rides are deleted, the window should be reset so the currentRide can be placed again. // When flat rides are deleted, the window should be reset so the currentRide can be placed again.
auto currentRide = get_ride(_currentRideIndex); auto currentRide = get_ride(_currentRideIndex);
const auto& rtd = currentRide->GetRideTypeDescriptor(); const auto& rtd = currentRide->GetRideTypeDescriptor();
if (rtd.HasFlag(RIDE_TYPE_FLAG_FLAT_RIDE) && !rtd.HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) if (rtd.HasFlag(RIDE_TYPE_FLAG_FLAT_RIDE) && !rtd.HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
{ {
ride_initialise_construction_window(currentRide); ride_initialise_construction_window(currentRide);
} }
@ -3269,7 +3269,7 @@ void ride_construction_toolupdate_construct(const ScreenCoordsXY& screenCoords)
} }
if (_autoRotatingShop && _rideConstructionState == RideConstructionState::Place if (_autoRotatingShop && _rideConstructionState == RideConstructionState::Place
&& ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) && ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
{ {
TileElement* pathsByDir[NumOrthogonalDirections]; TileElement* pathsByDir[NumOrthogonalDirections];

2
src/openrct2/actions/RideCreateAction.cpp
View File

@ -263,7 +263,7 @@ GameActions::Result RideCreateAction::Execute() const
} }
// Set the on-ride photo price, whether the ride has one or not (except shops). // Set the on-ride photo price, whether the ride has one or not (except shops).
if (!rtd.HasFlag(RIDE_TYPE_FLAG_IS_SHOP) && shop_item_has_common_price(ShopItem::Photo)) if (!rtd.HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY) && shop_item_has_common_price(ShopItem::Photo))
{ {
money32 price = shop_item_get_common_price(ride, ShopItem::Photo); money32 price = shop_item_get_common_price(ride, ShopItem::Photo);
if (price != MONEY32_UNDEFINED) if (price != MONEY32_UNDEFINED)

2
src/openrct2/entity/Guest.cpp
View File

@ -1937,7 +1937,7 @@ bool Guest::ShouldGoOnRide(Ride* ride, StationIndex entranceNum, bool atQueue, b
} }
} }
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
{ {
return ShouldGoToShop(ride, peepAtRide); return ShouldGoToShop(ride, peepAtRide);
} }

2
src/openrct2/entity/Peep.cpp
View File

@ -2238,7 +2238,7 @@ static bool peep_interact_with_shop(Peep* peep, const CoordsXYE& coords)
{ {
RideId rideIndex = coords.element->AsTrack()->GetRideIndex(); RideId rideIndex = coords.element->AsTrack()->GetRideIndex();
auto ride = get_ride(rideIndex); auto ride = get_ride(rideIndex);
if (ride == nullptr || !ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) if (ride == nullptr || !ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
return false; return false;
auto* guest = peep->As<Guest>(); auto* guest = peep->As<Guest>();

14
src/openrct2/object/RideObject.cpp
View File

@ -863,19 +863,7 @@ std::vector<VehicleColour> RideObject::ReadJsonColourConfiguration(json_t& jColo
bool RideObject::IsRideTypeShopOrFacility(uint8_t rideType) bool RideObject::IsRideTypeShopOrFacility(uint8_t rideType)
{ {
switch (rideType) return GetRideTypeDescriptor(rideType).HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY);
{
case RIDE_TYPE_TOILETS:
case RIDE_TYPE_SHOP:
case RIDE_TYPE_DRINK_STALL:
case RIDE_TYPE_FOOD_STALL:
case RIDE_TYPE_INFORMATION_KIOSK:
case RIDE_TYPE_CASH_MACHINE:
case RIDE_TYPE_FIRST_AID:
return true;
default:
return false;
}
} }
uint8_t RideObject::ParseRideType(const std::string& s) uint8_t RideObject::ParseRideType(const std::string& s)

4
src/openrct2/peep/GuestPathfinding.cpp
View File

@ -348,7 +348,7 @@ static uint8_t footpath_element_dest_in_dir(TileCoordsXYZ loc, Direction chosenD
continue; continue;
RideId rideIndex = tileElement->AsTrack()->GetRideIndex(); RideId rideIndex = tileElement->AsTrack()->GetRideIndex();
auto ride = get_ride(rideIndex); auto ride = get_ride(rideIndex);
if (ride != nullptr && ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) if (ride != nullptr && ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
{ {
*outRideIndex = rideIndex; *outRideIndex = rideIndex;
return PATH_SEARCH_SHOP_ENTRANCE; return PATH_SEARCH_SHOP_ENTRANCE;
@ -766,7 +766,7 @@ static void peep_pathfind_heuristic_search(
* tile. */ * tile. */
rideIndex = tileElement->AsTrack()->GetRideIndex(); rideIndex = tileElement->AsTrack()->GetRideIndex();
auto ride = get_ride(rideIndex); auto ride = get_ride(rideIndex);
if (ride == nullptr || !ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) if (ride == nullptr || !ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
continue; continue;
found = true; found = true;

8
src/openrct2/ride/Ride.cpp
View File

@ -792,7 +792,7 @@ void Ride::FormatStatusTo(Formatter& ft) const
} }
else if (status == RideStatus::Closed) else if (status == RideStatus::Closed)
{ {
if (!GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) if (!GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
{ {
if (num_riders != 0) if (num_riders != 0)
{ {
@ -831,7 +831,7 @@ void Ride::FormatStatusTo(Formatter& ft) const
ft.Add<StringId>(STR_NONE); ft.Add<StringId>(STR_NONE);
} }
} }
else if (!GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) else if (!GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
{ {
ft.Add<StringId>(num_riders == 1 ? STR_PERSON_ON_RIDE : STR_PEOPLE_ON_RIDE); ft.Add<StringId>(num_riders == 1 ? STR_PERSON_ON_RIDE : STR_PEOPLE_ON_RIDE);
ft.Add<uint16_t>(num_riders); ft.Add<uint16_t>(num_riders);
@ -2231,7 +2231,7 @@ void ride_check_all_reachable()
if (ride.status != RideStatus::Open || ride.connected_message_throttle != 0) if (ride.status != RideStatus::Open || ride.connected_message_throttle != 0)
continue; continue;
if (ride.GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) if (ride.GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
ride_shop_connected(&ride); ride_shop_connected(&ride);
else else
ride_entrance_exit_connected(&ride); ride_entrance_exit_connected(&ride);
@ -2585,7 +2585,7 @@ static ResultWithMessage ride_check_for_entrance_exit(RideId rideIndex)
if (ride == nullptr) if (ride == nullptr)
return { false }; return { false };
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
return { true }; return { true };
uint8_t entrance = 0; uint8_t entrance = 0;

2
src/openrct2/ride/RideConstruction.cpp
View File

@ -1640,7 +1640,7 @@ bool ride_select_forwards_from_back()
*/ */
ResultWithMessage ride_are_all_possible_entrances_and_exits_built(Ride* ride) ResultWithMessage ride_are_all_possible_entrances_and_exits_built(Ride* ride)
{ {
if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
return { true }; return { true };
for (auto& station : ride->GetStations()) for (auto& station : ride->GetStations())

2
src/openrct2/ride/RideData.h
View File

@ -261,7 +261,7 @@ enum ride_type_flags : uint64_t
RIDE_TYPE_FLAG_HAS_NO_TRACK = (1ULL << 15), RIDE_TYPE_FLAG_HAS_NO_TRACK = (1ULL << 15),
RIDE_TYPE_FLAG_VEHICLE_IS_INTEGRAL = (1ULL << 16), // Set by flat rides where the vehicle is integral to the structure, like RIDE_TYPE_FLAG_VEHICLE_IS_INTEGRAL = (1ULL << 16), // Set by flat rides where the vehicle is integral to the structure, like
// Merry-go-round and swinging ships. (Contrast with rides like dodgems.) // Merry-go-round and swinging ships. (Contrast with rides like dodgems.)
RIDE_TYPE_FLAG_IS_SHOP = (1ULL << 17), RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY = (1ULL << 17),
RIDE_TYPE_FLAG_TRACK_NO_WALLS = (1ULL << 18), // if set, wall scenery can not share a tile with the ride's track RIDE_TYPE_FLAG_TRACK_NO_WALLS = (1ULL << 18), // if set, wall scenery can not share a tile with the ride's track
RIDE_TYPE_FLAG_FLAT_RIDE = (1ULL << 19), RIDE_TYPE_FLAG_FLAT_RIDE = (1ULL << 19),
RIDE_TYPE_FLAG_PEEP_WILL_RIDE_AGAIN = (1ULL << 20), // whether or not guests will go on the ride again if they liked it RIDE_TYPE_FLAG_PEEP_WILL_RIDE_AGAIN = (1ULL << 20), // whether or not guests will go on the ride again if they liked it

2
src/openrct2/ride/TrackPaint.cpp
View File

@ -2229,7 +2229,7 @@ void PaintTrack(paint_session& session, Direction direction, int32_t height, con
if (ride->type == RIDE_TYPE_INFORMATION_KIOSK) if (ride->type == RIDE_TYPE_INFORMATION_KIOSK)
LightFxAddKioskLights(session.MapPosition, height, zOffset); LightFxAddKioskLights(session.MapPosition, height, zOffset);
else if (RideTypeDescriptors[ride->type].HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) else if (RideTypeDescriptors[ride->type].HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
LightFxAddShopLights(session.MapPosition, trackElement.GetDirection(), height, zOffset); LightFxAddShopLights(session.MapPosition, trackElement.GetDirection(), height, zOffset);
} }

2
src/openrct2/ride/shops/meta/CashMachine.h
View File

@ -24,7 +24,7 @@ constexpr const RideTypeDescriptor CashMachineRTD =
SET_FIELD(StartTrackPiece, TrackElemType::FlatTrack1x1A), SET_FIELD(StartTrackPiece, TrackElemType::FlatTrack1x1A),
SET_FIELD(TrackPaintFunction, get_track_paint_function_shop), SET_FIELD(TrackPaintFunction, get_track_paint_function_shop),
SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES | RIDE_TYPE_FLAG_IS_CASH_MACHINE | SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES | RIDE_TYPE_FLAG_IS_CASH_MACHINE |
RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY), RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY),
SET_FIELD(RideModes, EnumsToFlags(RideMode::ShopStall)), SET_FIELD(RideModes, EnumsToFlags(RideMode::ShopStall)),
SET_FIELD(DefaultMode, RideMode::ShopStall), SET_FIELD(DefaultMode, RideMode::ShopStall),
SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }),

2
src/openrct2/ride/shops/meta/DrinkStall.h
View File

@ -24,7 +24,7 @@ constexpr const RideTypeDescriptor DrinkStallRTD =
SET_FIELD(StartTrackPiece, TrackElemType::FlatTrack1x1A), SET_FIELD(StartTrackPiece, TrackElemType::FlatTrack1x1A),
SET_FIELD(TrackPaintFunction, get_track_paint_function_shop), SET_FIELD(TrackPaintFunction, get_track_paint_function_shop),
SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES | SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES |
RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE |
RIDE_TYPE_FLAG_SELLS_DRINKS | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN), RIDE_TYPE_FLAG_SELLS_DRINKS | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN),
SET_FIELD(RideModes, EnumsToFlags(RideMode::ShopStall)), SET_FIELD(RideModes, EnumsToFlags(RideMode::ShopStall)),
SET_FIELD(DefaultMode, RideMode::ShopStall), SET_FIELD(DefaultMode, RideMode::ShopStall),

2
src/openrct2/ride/shops/meta/FirstAid.h
View File

@ -24,7 +24,7 @@ constexpr const RideTypeDescriptor FirstAidRTD =
SET_FIELD(StartTrackPiece, TrackElemType::FlatTrack1x1A), SET_FIELD(StartTrackPiece, TrackElemType::FlatTrack1x1A),
SET_FIELD(TrackPaintFunction, get_track_paint_function_facility), SET_FIELD(TrackPaintFunction, get_track_paint_function_facility),
SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES | SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES |
RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_IS_FIRST_AID | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_IS_FIRST_AID |
RIDE_TYPE_FLAG_PEEP_SHOULD_GO_INSIDE_FACILITY | RIDE_TYPE_FLAG_IN_RIDE | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY), RIDE_TYPE_FLAG_PEEP_SHOULD_GO_INSIDE_FACILITY | RIDE_TYPE_FLAG_IN_RIDE | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY),
SET_FIELD(RideModes, EnumsToFlags(RideMode::ShopStall)), SET_FIELD(RideModes, EnumsToFlags(RideMode::ShopStall)),
SET_FIELD(DefaultMode, RideMode::ShopStall), SET_FIELD(DefaultMode, RideMode::ShopStall),

2
src/openrct2/ride/shops/meta/FoodStall.h
View File

@ -24,7 +24,7 @@ constexpr const RideTypeDescriptor FoodStallRTD =
SET_FIELD(StartTrackPiece, TrackElemType::FlatTrack1x1A), SET_FIELD(StartTrackPiece, TrackElemType::FlatTrack1x1A),
SET_FIELD(TrackPaintFunction, get_track_paint_function_shop), SET_FIELD(TrackPaintFunction, get_track_paint_function_shop),
SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES | SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES |
RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE |
RIDE_TYPE_FLAG_SELLS_FOOD | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN), RIDE_TYPE_FLAG_SELLS_FOOD | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN),
SET_FIELD(RideModes, EnumsToFlags(RideMode::ShopStall)), SET_FIELD(RideModes, EnumsToFlags(RideMode::ShopStall)),
SET_FIELD(DefaultMode, RideMode::ShopStall), SET_FIELD(DefaultMode, RideMode::ShopStall),

2
src/openrct2/ride/shops/meta/InformationKiosk.h
View File

@ -24,7 +24,7 @@ constexpr const RideTypeDescriptor InformationKioskRTD =
SET_FIELD(StartTrackPiece, TrackElemType::FlatTrack1x1B), SET_FIELD(StartTrackPiece, TrackElemType::FlatTrack1x1B),
SET_FIELD(TrackPaintFunction, get_track_paint_function_shop), SET_FIELD(TrackPaintFunction, get_track_paint_function_shop),
SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS |
RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY |
RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY), RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY),
SET_FIELD(RideModes, EnumsToFlags(RideMode::ShopStall)), SET_FIELD(RideModes, EnumsToFlags(RideMode::ShopStall)),
SET_FIELD(DefaultMode, RideMode::ShopStall), SET_FIELD(DefaultMode, RideMode::ShopStall),

2
src/openrct2/ride/shops/meta/Shop.h
View File

@ -24,7 +24,7 @@ constexpr const RideTypeDescriptor ShopRTD =
SET_FIELD(StartTrackPiece, TrackElemType::FlatTrack1x1A), SET_FIELD(StartTrackPiece, TrackElemType::FlatTrack1x1A),
SET_FIELD(TrackPaintFunction, get_track_paint_function_shop), SET_FIELD(TrackPaintFunction, get_track_paint_function_shop),
SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS |
RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY |
RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY), RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY),
SET_FIELD(RideModes, EnumsToFlags(RideMode::ShopStall)), SET_FIELD(RideModes, EnumsToFlags(RideMode::ShopStall)),
SET_FIELD(DefaultMode, RideMode::ShopStall), SET_FIELD(DefaultMode, RideMode::ShopStall),

2
src/openrct2/ride/shops/meta/Toilets.h
View File

@ -24,7 +24,7 @@ constexpr const RideTypeDescriptor ToiletsRTD =
SET_FIELD(StartTrackPiece, TrackElemType::FlatTrack1x1A), SET_FIELD(StartTrackPiece, TrackElemType::FlatTrack1x1A),
SET_FIELD(TrackPaintFunction, get_track_paint_function_facility), SET_FIELD(TrackPaintFunction, get_track_paint_function_facility),
SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES | SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES |
RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE |
RIDE_TYPE_FLAG_PEEP_SHOULD_GO_INSIDE_FACILITY | RIDE_TYPE_FLAG_IN_RIDE | RIDE_TYPE_FLAG_IS_TOILET | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY), RIDE_TYPE_FLAG_PEEP_SHOULD_GO_INSIDE_FACILITY | RIDE_TYPE_FLAG_IN_RIDE | RIDE_TYPE_FLAG_IS_TOILET | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY),
SET_FIELD(RideModes, EnumsToFlags(RideMode::ShopStall)), SET_FIELD(RideModes, EnumsToFlags(RideMode::ShopStall)),
SET_FIELD(DefaultMode, RideMode::ShopStall), SET_FIELD(DefaultMode, RideMode::ShopStall),

4
src/openrct2/world/Banner.cpp
View File

@ -100,7 +100,7 @@ static RideId banner_get_ride_index_at(const CoordsXYZ& bannerCoords)
RideId rideIndex = tileElement->AsTrack()->GetRideIndex(); RideId rideIndex = tileElement->AsTrack()->GetRideIndex();
auto ride = get_ride(rideIndex); auto ride = get_ride(rideIndex);
if (ride == nullptr || ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) if (ride == nullptr || ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
continue; continue;
if ((tileElement->GetClearanceZ()) + (4 * COORDS_Z_STEP) <= bannerCoords.z) if ((tileElement->GetClearanceZ()) + (4 * COORDS_Z_STEP) <= bannerCoords.z)
@ -220,7 +220,7 @@ RideId banner_get_closest_ride_index(const CoordsXYZ& mapPos)
auto resultDistance = std::numeric_limits<int32_t>::max(); auto resultDistance = std::numeric_limits<int32_t>::max();
for (auto& ride : GetRideManager()) for (auto& ride : GetRideManager())
{ {
if (ride.GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) if (ride.GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY))
continue; continue;
auto rideCoords = ride.overall_view; auto rideCoords = ride.overall_view;