From 52918736d04cd0f92b8a89426b257b7782d8d29d Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 13 May 2021 16:20:25 +0200 Subject: [PATCH] Rename Sick to Vomit --- src/openrct2/peep/Guest.cpp | 2 +- src/openrct2/peep/Peep.cpp | 4 ++-- src/openrct2/ride/ShopItem.cpp | 8 ++++---- src/openrct2/world/Litter.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index d699418025..7693f7b050 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -5244,7 +5244,7 @@ void Guest::UpdateWalking() && ((0xFFFF & scenario_rand()) <= 4096)) { int32_t container = bitscanforward(GetEmptyContainerFlags()); - auto litterType = Litter::Type::Sick; + auto litterType = Litter::Type::Vomit; if (container != -1) { diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index ad4295d2c3..c83b1d449f 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -474,7 +474,7 @@ std::optional Peep::UpdateAction(int16_t& xy_distance) WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_2; // Create sick at location - Litter::Create({ x, y, z, sprite_direction }, (sprite_index & 1) ? Litter::Type::SickAlt : Litter::Type::Sick); + Litter::Create({ x, y, z, sprite_direction }, (sprite_index & 1) ? Litter::Type::VomitAlt : Litter::Type::Vomit); static constexpr OpenRCT2::Audio::SoundId coughs[4] = { OpenRCT2::Audio::SoundId::Cough1, OpenRCT2::Audio::SoundId::Cough2, OpenRCT2::Audio::SoundId::Cough3, @@ -1954,7 +1954,7 @@ static void peep_footpath_move_forward(Peep* peep, const CoordsXYE& coords, bool continue; litter_count++; - if (litter->SubType != Litter::Type::Sick && litter->SubType != Litter::Type::SickAlt) + if (litter->SubType != Litter::Type::Vomit && litter->SubType != Litter::Type::VomitAlt) continue; litter_count--; diff --git a/src/openrct2/ride/ShopItem.cpp b/src/openrct2/ride/ShopItem.cpp index 1895ed4623..38605a29e8 100644 --- a/src/openrct2/ride/ShopItem.cpp +++ b/src/openrct2/ride/ShopItem.cpp @@ -53,10 +53,10 @@ constexpr ShopItemDescriptor ShopItems[EnumValue(ShopItem::Count)] = { /* ShopItem::Lemonade */ { MONEY(0, 40), MONEY(1, 10), MONEY(2, 10), MONEY(1, 00), MONEY(1, 20), SPR_SHOP_ITEM_LEMONADE, { STR_SHOP_ITEM_PRICE_LABEL_LEMONADE, STR_SHOP_ITEM_SINGULAR_LEMONADE, STR_SHOP_ITEM_PLURAL_LEMONADE, STR_SHOP_ITEM_INDEFINITE_LEMONADE, STR_SHOP_ITEM_DISPLAY_LEMONADE }, SHOP_ITEM_FLAG_IS_DRINK, Litter::Type::EmptyBottle, 115, ShopItem::EmptyBottle, PeepThoughtType::LemonadeMuch, PeepThoughtType::Lemonade }, /* ShopItem::EmptyBox */ { MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), SPR_SHOP_ITEM_EMPTY_BOX, { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_BOX, STR_SHOP_ITEM_SINGULAR_EMPTY_BOX, STR_SHOP_ITEM_PLURAL_EMPTY_BOX, STR_SHOP_ITEM_INDEFINITE_EMPTY_BOX, STR_SHOP_ITEM_DISPLAY_EMPTY_BOX }, SHOP_ITEM_FLAG_IS_CONTAINER, Litter::Type::EmptyBox, 0, ShopItem::None, PeepThoughtType::None, PeepThoughtType::None }, /* ShopItem::EmptyBottle */ { MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), SPR_SHOP_ITEM_EMPTY_BOTTLE, { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_BOTTLE, STR_SHOP_ITEM_SINGULAR_EMPTY_BOTTLE, STR_SHOP_ITEM_PLURAL_EMPTY_BOTTLE, STR_SHOP_ITEM_INDEFINITE_EMPTY_BOTTLE, STR_SHOP_ITEM_DISPLAY_EMPTY_BOTTLE }, SHOP_ITEM_FLAG_IS_CONTAINER, Litter::Type::EmptyBottle, 0, ShopItem::None, PeepThoughtType::None, PeepThoughtType::None }, - /* 28 */ { MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), 0, { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, 0, Litter::Type::Sick, 0xFF, ShopItem::None, PeepThoughtType::None, PeepThoughtType::None }, - /* 29 */ { MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), 0, { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, 0, Litter::Type::Sick, 0xFF, ShopItem::None, PeepThoughtType::None, PeepThoughtType::None }, - /* 30 */ { MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), 0, { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, 0, Litter::Type::Sick, 0xFF, ShopItem::None, PeepThoughtType::None, PeepThoughtType::None }, - /* ShopItem::Admission */ { MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), 0, { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, 0, Litter::Type::Sick, 0xFF, ShopItem::None, PeepThoughtType::None, PeepThoughtType::None }, + /* 28 */ { MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), 0, { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, 0, Litter::Type::Vomit, 0xFF, ShopItem::None, PeepThoughtType::None, PeepThoughtType::None }, + /* 29 */ { MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), 0, { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, 0, Litter::Type::Vomit, 0xFF, ShopItem::None, PeepThoughtType::None, PeepThoughtType::None }, + /* 30 */ { MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), 0, { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, 0, Litter::Type::Vomit, 0xFF, ShopItem::None, PeepThoughtType::None, PeepThoughtType::None }, + /* ShopItem::Admission */ { MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), MONEY(0, 00), 0, { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, 0, Litter::Type::Vomit, 0xFF, ShopItem::None, PeepThoughtType::None, PeepThoughtType::None }, /* ShopItem::Photo2 */ { MONEY(0, 20), MONEY(3, 00), MONEY(3, 00), MONEY(3, 00), MONEY(0, 00), SPR_SHOP_ITEM_PHOTO2, { STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO, STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO, STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO, STR_SHOP_ITEM_INDEFINITE_ON_RIDE_PHOTO, STR_SHOP_ITEM_DISPLAY_ON_RIDE_PHOTO }, SHOP_ITEM_FLAG_IS_PHOTO | SHOP_ITEM_FLAG_IS_SOUVENIR, Litter::Type::Rubbish, 0, ShopItem::None, PeepThoughtType::Photo2Much, PeepThoughtType::Photo2 }, /* ShopItem::Photo3 */ { MONEY(0, 20), MONEY(3, 00), MONEY(3, 00), MONEY(3, 00), MONEY(0, 00), SPR_SHOP_ITEM_PHOTO3, { STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO, STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO, STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO, STR_SHOP_ITEM_INDEFINITE_ON_RIDE_PHOTO, STR_SHOP_ITEM_DISPLAY_ON_RIDE_PHOTO }, SHOP_ITEM_FLAG_IS_PHOTO | SHOP_ITEM_FLAG_IS_SOUVENIR, Litter::Type::Rubbish, 0, ShopItem::None, PeepThoughtType::Photo3Much, PeepThoughtType::Photo3 }, /* ShopItem::Photo4 */ { MONEY(0, 20), MONEY(3, 00), MONEY(3, 00), MONEY(3, 00), MONEY(0, 00), SPR_SHOP_ITEM_PHOTO4, { STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO, STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO, STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO, STR_SHOP_ITEM_INDEFINITE_ON_RIDE_PHOTO, STR_SHOP_ITEM_DISPLAY_ON_RIDE_PHOTO }, SHOP_ITEM_FLAG_IS_PHOTO | SHOP_ITEM_FLAG_IS_SOUVENIR, Litter::Type::Rubbish, 0, ShopItem::None, PeepThoughtType::Photo4Much, PeepThoughtType::Photo4 }, diff --git a/src/openrct2/world/Litter.h b/src/openrct2/world/Litter.h index 5b500e4b32..b1cfe0a62f 100644 --- a/src/openrct2/world/Litter.h +++ b/src/openrct2/world/Litter.h @@ -19,8 +19,8 @@ struct Litter : SpriteBase { enum class Type : uint8_t { - Sick, - SickAlt, + Vomit, + VomitAlt, EmptyCan, Rubbish, BurgerBox,