mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 17:24:47 +01:00
Code Issues Releases Wiki Activity

Change ‘restroom’ to ‘toilet’ in the code

Browse Source
This commit is contained in:
Michael Steenbeek
2022-08-06 16:33:37 +02:00
committed by GitHub
parent 746722df1b
commit a7e66535d9
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,7 +177,7 @@ static constexpr const WindowParkAward _parkAwards[] = {
{ STR_AWARD_BEST_STAFF, SPR_AWARD_BEST_STAFF },
{ STR_AWARD_BEST_FOOD, SPR_AWARD_BEST_FOOD },
{ STR_AWARD_WORST_FOOD, SPR_AWARD_WORST_FOOD },
{ STR_AWARD_BEST_RESTROOMS, SPR_AWARD_BEST_RESTROOMS },
{ STR_AWARD_BEST_TOILETS, SPR_AWARD_BEST_TOILETS },
{ STR_AWARD_MOST_DISAPPOINTING, SPR_AWARD_MOST_DISAPPOINTING },
{ STR_AWARD_BEST_WATER_RIDES, SPR_AWARD_BEST_WATER_RIDES },
{ STR_AWARD_BEST_CUSTOM_DESIGNED_RIDES, SPR_AWARD_BEST_CUSTOM_DESIGNED_RIDES },

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

@@ -123,7 +123,7 @@ static constexpr const StringId ride_info_type_string_mapping[DROPDOWN_LIST_COUN
static constexpr const StringId ride_list_statusbar_count_strings[PAGE_COUNT] = {
STR_NUMBER_RIDES,
STR_NUMBER_SHOPS_AND_STALLS,
STR_NUMBER_RESTROOMS_AND_INFORMATION_KIOSKS,
STR_NUMBER_TOILETS_AND_INFORMATION_KIOSKS,
};
static constexpr const bool ride_info_type_money_mapping[DROPDOWN_LIST_COUNT] = {
@@ -150,7 +150,7 @@ static constexpr const bool ride_info_type_money_mapping[DROPDOWN_LIST_COUNT] =
static constexpr const StringId page_names[] = {
STR_RIDES,
STR_SHOPS_AND_STALLS,
STR_RESTROOMS_AND_INFORMATION_KIOSKS,
STR_TOILETS_AND_INFORMATION_KIOSKS,
};
class RideListWindow final : public Window

8
src/openrct2/localisation/StringIds.h
View File

@@ -394,7 +394,7 @@ enum : uint16_t
STR_OK = 973,
STR_RIDES = 974,
STR_SHOPS_AND_STALLS = 975,
STR_RESTROOMS_AND_INFORMATION_KIOSKS = 976,
STR_TOILETS_AND_INFORMATION_KIOSKS = 976,
STR_NEW_TRANSPORT_RIDES = 977,
STR_NEW_GENTLE_RIDES = 978,
STR_NEW_ROLLER_COASTERS = 979,
@@ -2134,7 +2134,7 @@ enum : uint16_t
STR_AWARD_BEST_STAFF = STR_AWARD_MOST_UNTIDY + 7,
STR_AWARD_BEST_FOOD = STR_AWARD_MOST_UNTIDY + 8,
STR_AWARD_WORST_FOOD = STR_AWARD_MOST_UNTIDY + 9,
STR_AWARD_BEST_RESTROOMS = STR_AWARD_MOST_UNTIDY + 10,
STR_AWARD_BEST_TOILETS = STR_AWARD_MOST_UNTIDY + 10,
STR_AWARD_MOST_DISAPPOINTING = STR_AWARD_MOST_UNTIDY + 11,
STR_AWARD_BEST_WATER_RIDES = STR_AWARD_MOST_UNTIDY + 12,
STR_AWARD_BEST_CUSTOM_DESIGNED_RIDES = STR_AWARD_MOST_UNTIDY + 13,
@@ -2151,7 +2151,7 @@ enum : uint16_t
STR_NEWS_ITEM_BEST_STAFF = STR_NEWS_ITEM_AWARD_MOST_UNTIDY + 7,
STR_NEWS_ITEM_BEST_FOOD = STR_NEWS_ITEM_AWARD_MOST_UNTIDY + 8,
STR_NEWS_ITEM_WORST_FOOD = STR_NEWS_ITEM_AWARD_MOST_UNTIDY + 9,
STR_NEWS_ITEM_BEST_RESTROOMS = STR_NEWS_ITEM_AWARD_MOST_UNTIDY + 10,
STR_NEWS_ITEM_BEST_TOILETS = STR_NEWS_ITEM_AWARD_MOST_UNTIDY + 10,
STR_NEWS_ITEM_MOST_DISAPPOINTING = STR_NEWS_ITEM_AWARD_MOST_UNTIDY + 11,
STR_NEWS_ITEM_BEST_WATER_RIDES = STR_NEWS_ITEM_AWARD_MOST_UNTIDY + 12,
STR_NEWS_ITEM_BEST_CUSTOM_DESIGNED_RIDES = STR_NEWS_ITEM_AWARD_MOST_UNTIDY + 13,
@@ -3097,7 +3097,7 @@ enum : uint16_t
STR_SHORTCUT_WINDOWED_MODE_TOGGLE = 5806,
STR_NUMBER_RIDES = 5807,
STR_NUMBER_SHOPS_AND_STALLS = 5808,
STR_NUMBER_RESTROOMS_AND_INFORMATION_KIOSKS = 5809,
STR_NUMBER_TOILETS_AND_INFORMATION_KIOSKS = 5809,
STR_CHEAT_DISABLE_TRAIN_LENGTH_LIMIT = 5810,
STR_CHEAT_DISABLE_TRAIN_LENGTH_LIMIT_TIP = 5811,
STR_SHORTCUT_SHOW_MULTIPLAYER = 5812,

30
src/openrct2/management/Award.cpp
View File

@@ -37,7 +37,7 @@ static constexpr const uint8_t AwardPositiveMap[] = {
POSITIVE, // AwardType::BestStaff
POSITIVE, // AwardType::BestFood
NEGATIVE, // AwardType::WorstFood
POSITIVE, // AwardType::BestRestrooms
POSITIVE, // AwardType::BestToilets
NEGATIVE, // AwardType::MostDisappointing
POSITIVE, // AwardType::BestWaterRides
POSITIVE, // AwardType::BestCustomDesignedRides
@@ -57,7 +57,7 @@ static constexpr const StringId AwardNewsStrings[] = {
STR_NEWS_ITEM_BEST_STAFF,
STR_NEWS_ITEM_BEST_FOOD,
STR_NEWS_ITEM_WORST_FOOD,
STR_NEWS_ITEM_BEST_RESTROOMS,
STR_NEWS_ITEM_BEST_TOILETS,
STR_NEWS_ITEM_MOST_DISAPPOINTING,
STR_NEWS_ITEM_BEST_WATER_RIDES,
STR_NEWS_ITEM_BEST_CUSTOM_DESIGNED_RIDES,
@@ -370,26 +370,26 @@ static bool award_is_deserved_worst_food(int32_t activeAwardTypes)
return (hungryPeeps > 15);
}
/** At least 4 restrooms, 1 restroom per 128 guests and no more than 16 guests who think they need the restroom. */
static bool award_is_deserved_best_restrooms([[maybe_unused]] int32_t activeAwardTypes)
/** At least 4 toilets, 1 toilet per 128 guests and no more than 16 guests who think they need the toilet. */
static bool award_is_deserved_best_toilets([[maybe_unused]] int32_t activeAwardTypes)
{
// Count open restrooms
// Count open toilets
const auto& rideManager = GetRideManager();
auto numRestrooms = static_cast<size_t>(std::count_if(rideManager.begin(), rideManager.end(), [](const Ride& ride) {
auto numToilets = static_cast<size_t>(std::count_if(rideManager.begin(), rideManager.end(), [](const Ride& ride) {
const auto& rtd = ride.GetRideTypeDescriptor();
return rtd.HasFlag(RIDE_TYPE_FLAG_IS_TOILET) && ride.status == RideStatus::Open;
}));
// At least 4 open restrooms
if (numRestrooms < 4)
// At least 4 open toilets
if (numToilets < 4)
return false;
// At least one open restroom for every 128 guests
if (numRestrooms < gNumGuestsInPark / 128U)
// At least one open toilet for every 128 guests
if (numToilets < gNumGuestsInPark / 128U)
return false;
// Count number of guests who are thinking they need the restroom
auto guestsWhoNeedRestroom = 0;
// Count number of guests who are thinking they need the toilet
auto guestsWhoNeedToilet = 0;
for (auto peep : EntityList<Guest>())
{
if (peep->OutsideOfPark)
@@ -397,9 +397,9 @@ static bool award_is_deserved_best_restrooms([[maybe_unused]] int32_t activeAwar
const auto& thought = std::get<0>(peep->Thoughts);
if (thought.freshness <= 5 && thought.type == PeepThoughtType::Toilet)
guestsWhoNeedRestroom++;
guestsWhoNeedToilet++;
}
return (guestsWhoNeedRestroom <= 16);
return (guestsWhoNeedToilet <= 16);
}
/** More than half of the rides have satisfaction <= 6 and park rating <= 650. */
@@ -577,7 +577,7 @@ static constexpr const award_deserved_check _awardChecks[] = {
award_is_deserved_best_staff,
award_is_deserved_best_food,
award_is_deserved_worst_food,
award_is_deserved_best_restrooms,
award_is_deserved_best_toilets,
award_is_deserved_most_disappointing,
award_is_deserved_best_water_rides,
award_is_deserved_best_custom_designed_rides,

2
src/openrct2/management/Award.h
View File

@@ -25,7 +25,7 @@ enum class AwardType : uint16_t
BestStaff,
BestFood,
WorstFood,
BestRestrooms,
BestToilets,
MostDisappointing,
BestWaterRides,
BestCustomDesignedRides,

2
src/openrct2/object/DefaultObjects.cpp
View File

@@ -28,7 +28,7 @@ const std::string_view DefaultSelectedObjects[] = {
"rct2.ride.lfb1", // Ride: Log Flume
"rct2.ride.vcr", // Ride: Vintage Cars
"rct2.ride.mgr1", // Ride: Merry-Go-Round
"rct2.ride.tlt1", // Ride: Restroom
"rct2.ride.tlt1", // Ride: Toilet
"rct2.ride.atm1", // Ride: Cash Machine
"rct2.ride.faid1", // Ride: First Aid Room
"rct2.ride.infok", // Ride: Information Kiosk

2
src/openrct2/sprites.h
View File

@@ -393,7 +393,7 @@ enum
SPR_AWARD_BEST_STAFF = SPR_AWARD_MOST_UNTIDY + 7,
SPR_AWARD_BEST_FOOD = SPR_AWARD_MOST_UNTIDY + 8,
SPR_AWARD_WORST_FOOD = SPR_AWARD_MOST_UNTIDY + 9,
SPR_AWARD_BEST_RESTROOMS = SPR_AWARD_MOST_UNTIDY + 10,
SPR_AWARD_BEST_TOILETS = SPR_AWARD_MOST_UNTIDY + 10,
SPR_AWARD_MOST_DISAPPOINTING = SPR_AWARD_MOST_UNTIDY + 11,
SPR_AWARD_BEST_WATER_RIDES = SPR_AWARD_MOST_UNTIDY + 12,
SPR_AWARD_BEST_CUSTOM_DESIGNED_RIDES = SPR_AWARD_MOST_UNTIDY + 13,