From a7e66535d9d805043118e62175b81d6c1d5f8a06 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sat, 6 Aug 2022 16:33:37 +0200 Subject: [PATCH] =?UTF-8?q?Change=20=E2=80=98restroom=E2=80=99=20to=20?= =?UTF-8?q?=E2=80=98toilet=E2=80=99=20in=20the=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/openrct2-ui/windows/Park.cpp | 2 +- src/openrct2-ui/windows/RideList.cpp | 4 ++-- src/openrct2/localisation/StringIds.h | 8 +++---- src/openrct2/management/Award.cpp | 30 +++++++++++++------------- src/openrct2/management/Award.h | 2 +- src/openrct2/object/DefaultObjects.cpp | 2 +- src/openrct2/sprites.h | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 748ca14fa7..25cf16577e 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -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 }, diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 496a358cff..c6ebeaf918 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -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 diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index 28461084de..e2e5701d5c 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -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, diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index 0937571b86..f870e56429 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -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(std::count_if(rideManager.begin(), rideManager.end(), [](const Ride& ride) { + auto numToilets = static_cast(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()) { 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, diff --git a/src/openrct2/management/Award.h b/src/openrct2/management/Award.h index 3e45d13ae4..eb141c20f1 100644 --- a/src/openrct2/management/Award.h +++ b/src/openrct2/management/Award.h @@ -25,7 +25,7 @@ enum class AwardType : uint16_t BestStaff, BestFood, WorstFood, - BestRestrooms, + BestToilets, MostDisappointing, BestWaterRides, BestCustomDesignedRides, diff --git a/src/openrct2/object/DefaultObjects.cpp b/src/openrct2/object/DefaultObjects.cpp index 36ed07937f..2817662090 100644 --- a/src/openrct2/object/DefaultObjects.cpp +++ b/src/openrct2/object/DefaultObjects.cpp @@ -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 diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index a4777fc2c7..c6f84dc5ba 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -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,