diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index a8f376eaf3..ca46f8e239 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -296,7 +296,7 @@ namespace OpenRCT2::Ui::Windows // as well as 1 sprite for sitting and 1 for standing still. auto itemFrame = (currentFrame / 4) % 6; - if (guest->AnimationGroup == PeepAnimationGroup::Hat) + if (guest->AnimationGroup == PeepAnimationGroup::hat) { auto itemOffset = kPeepSpriteHatItemStart + 1; auto imageId = ImageId(itemOffset + itemFrame * 4, guest->HatColour); @@ -304,7 +304,7 @@ namespace OpenRCT2::Ui::Windows return; } - if (guest->AnimationGroup == PeepAnimationGroup::Balloon) + if (guest->AnimationGroup == PeepAnimationGroup::balloon) { auto itemOffset = kPeepSpriteBalloonItemStart + 1; auto imageId = ImageId(itemOffset + itemFrame * 4, guest->BalloonColour); @@ -312,7 +312,7 @@ namespace OpenRCT2::Ui::Windows return; } - if (guest->AnimationGroup == PeepAnimationGroup::Umbrella) + if (guest->AnimationGroup == PeepAnimationGroup::umbrella) { auto itemOffset = kPeepSpriteUmbrellaItemStart + 1; auto imageId = ImageId(itemOffset + itemFrame * 4, guest->UmbrellaColour); diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 6cdba8bfba..6c920b7059 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -589,21 +589,21 @@ namespace OpenRCT2::Ui::Windows // There are only 6 walking frames available for each item. auto itemFrame = (_guestAnimationFrame / 4) % 6; - if (guest->AnimationGroup == PeepAnimationGroup::Hat) + if (guest->AnimationGroup == PeepAnimationGroup::hat) { auto itemOffset = kPeepSpriteHatItemStart + 1; auto imageId = ImageId(itemOffset + itemFrame * 4, guest->HatColour); GfxDrawSprite(clipDpi, imageId, screenCoords); } - if (guest->AnimationGroup == PeepAnimationGroup::Balloon) + if (guest->AnimationGroup == PeepAnimationGroup::balloon) { auto itemOffset = kPeepSpriteBalloonItemStart + 1; auto imageId = ImageId(itemOffset + itemFrame * 4, guest->BalloonColour); GfxDrawSprite(clipDpi, imageId, screenCoords); } - if (guest->AnimationGroup == PeepAnimationGroup::Umbrella) + if (guest->AnimationGroup == PeepAnimationGroup::umbrella) { auto itemOffset = kPeepSpriteUmbrellaItemStart + 1; auto imageId = ImageId(itemOffset + itemFrame * 4, guest->UmbrellaColour); diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index 009b8f8836..f7cf20abee 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -629,7 +629,7 @@ namespace OpenRCT2::Ui::Windows // Tab 1 image auto i = (_selectedTab == TabId::Individual ? _tabAnimationIndex & ~3 : 0); auto* animObj = findPeepAnimationsObjectForType(AnimationPeepType::guest); - i += animObj->GetPeepAnimation(PeepAnimationGroup::Normal).baseImage + 1; + i += animObj->GetPeepAnimation(PeepAnimationGroup::normal).baseImage + 1; GfxDrawSprite( rt, ImageId(i, COLOUR_GREY, COLOUR_DARK_OLIVE_GREEN), windowPos + ScreenCoordsXY{ widgets[WIDX_TAB_1].midX(), widgets[WIDX_TAB_1].bottom - 6 }); diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index c8393831d8..250b336107 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -514,7 +514,7 @@ namespace OpenRCT2::Ui::Windows // If normal peep set sprite to normal (no food) // If staff set sprite to staff sprite - auto spriteType = PeepAnimationGroup::Normal; + auto spriteType = PeepAnimationGroup::normal; if (auto* staff = peep->As(); staff != nullptr) { spriteType = staff->AnimationGroup; diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 48c3784458..cc432cab78 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -1236,7 +1236,7 @@ namespace OpenRCT2::Ui::Windows auto* animObj = findPeepAnimationsObjectForType(AnimationPeepType::guest); ImageId peepImage( - animObj->GetPeepAnimation(PeepAnimationGroup::Normal).baseImage + 1, COLOUR_BRIGHT_RED, COLOUR_TEAL); + animObj->GetPeepAnimation(PeepAnimationGroup::normal).baseImage + 1, COLOUR_BRIGHT_RED, COLOUR_TEAL); if (page == WINDOW_PARK_PAGE_GUESTS) peepImage = peepImage.WithIndexOffset(_peepAnimationFrame & 0xFFFFFFFC); diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 65aead3f61..db031f5d8e 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -1327,7 +1327,7 @@ namespace OpenRCT2::Ui::Windows spriteIndex = pickedPeepFrame & ~3; auto* animObj = findPeepAnimationsObjectForType(AnimationPeepType::guest); - spriteIndex += animObj->GetPeepAnimation(PeepAnimationGroup::Normal).baseImage + 1; + spriteIndex += animObj->GetPeepAnimation(PeepAnimationGroup::normal).baseImage + 1; GfxDrawSprite( rt, ImageId(spriteIndex, COLOUR_BRIGHT_RED, COLOUR_TEAL), diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 048355c40d..66d33095ee 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -170,7 +170,7 @@ namespace OpenRCT2::Ui::Windows auto* animObj = findPeepAnimationsObjectForType(animPeepType); if (animObj != nullptr) { - auto& anim = animObj->GetPeepAnimation(PeepAnimationGroup::Normal); + auto& anim = animObj->GetPeepAnimation(PeepAnimationGroup::normal); _tabAnimationIndex++; if (_tabAnimationIndex >= anim.frameOffsets.size() * 4) @@ -611,7 +611,7 @@ namespace OpenRCT2::Ui::Windows const auto& widget = widgets[widgetIndex]; auto frame = _selectedTab == tabIndex ? _tabAnimationIndex / 4 : 0; - auto& anim = animObj->GetPeepAnimation(PeepAnimationGroup::Normal); + auto& anim = animObj->GetPeepAnimation(PeepAnimationGroup::normal); auto imageId = anim.baseImage + 1 + anim.frameOffsets[frame] * 4; GfxDrawSprite( @@ -634,7 +634,7 @@ namespace OpenRCT2::Ui::Windows widget.right - widget.left - 1, widget.bottom - widget.top - 1)) { auto frame = _selectedTab == tabIndex ? _tabAnimationIndex / 4 : 0; - auto& anim = animObj->GetPeepAnimation(PeepAnimationGroup::Normal); + auto& anim = animObj->GetPeepAnimation(PeepAnimationGroup::normal); auto imageId = anim.baseImage + 1 + anim.frameOffsets[frame] * 4; GfxDrawSprite(clippedDpi, ImageId(imageId), { 15, 23 }); diff --git a/src/openrct2/actions/StaffHireNewAction.cpp b/src/openrct2/actions/StaffHireNewAction.cpp index f73e614586..ed257db01b 100644 --- a/src/openrct2/actions/StaffHireNewAction.cpp +++ b/src/openrct2/actions/StaffHireNewAction.cpp @@ -155,13 +155,13 @@ namespace OpenRCT2::GameActions newPeep->Name = nullptr; newPeep->AnimationObjectIndex = animObjectIndex; - newPeep->AnimationGroup = PeepAnimationGroup::Normal; + newPeep->AnimationGroup = PeepAnimationGroup::normal; auto& objManager = GetContext()->GetObjectManager(); auto* animObj = objManager.GetLoadedObject(animObjectIndex); newPeep->PeepFlags &= ~PEEP_FLAGS_SLOW_WALK; - if (animObj->IsSlowWalking(PeepAnimationGroup::Normal)) + if (animObj->IsSlowWalking(PeepAnimationGroup::normal)) newPeep->PeepFlags |= PEEP_FLAGS_SLOW_WALK; const auto& spriteBounds = animObj->GetSpriteBounds(newPeep->AnimationGroup); diff --git a/src/openrct2/actions/StaffSetCostumeAction.cpp b/src/openrct2/actions/StaffSetCostumeAction.cpp index e131b47bde..8cc1cb6f48 100644 --- a/src/openrct2/actions/StaffSetCostumeAction.cpp +++ b/src/openrct2/actions/StaffSetCostumeAction.cpp @@ -82,13 +82,13 @@ namespace OpenRCT2::GameActions } staff->AnimationObjectIndex = _costume; - staff->AnimationGroup = PeepAnimationGroup::Normal; + staff->AnimationGroup = PeepAnimationGroup::normal; auto& objManager = GetContext()->GetObjectManager(); auto* animObj = objManager.GetLoadedObject(_costume); staff->PeepFlags &= ~PEEP_FLAGS_SLOW_WALK; - if (animObj->IsSlowWalking(PeepAnimationGroup::Normal)) + if (animObj->IsSlowWalking(PeepAnimationGroup::normal)) staff->PeepFlags |= PEEP_FLAGS_SLOW_WALK; staff->AnimationFrameNum = 0; diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index af7e4779d0..7702549eb4 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -1331,7 +1331,7 @@ void Guest::UpdateSitting() return; } - if (AnimationGroup == PeepAnimationGroup::Umbrella) + if (AnimationGroup == PeepAnimationGroup::umbrella) { GuestTryGetUpFromSitting(*this); return; @@ -1357,7 +1357,7 @@ void Guest::UpdateSitting() GuestTryGetUpFromSitting(*this); return; } - if (AnimationGroup == PeepAnimationGroup::Balloon || AnimationGroup == PeepAnimationGroup::Hat) + if (AnimationGroup == PeepAnimationGroup::balloon || AnimationGroup == PeepAnimationGroup::hat) { GuestTryGetUpFromSitting(*this); return; @@ -5787,7 +5787,7 @@ void Guest::UpdateQueuing() PerformNextAction(); if (!IsActionInterruptable()) return; - if (AnimationGroup == PeepAnimationGroup::Normal) + if (AnimationGroup == PeepAnimationGroup::normal) { if (TimeInQueue >= 2000 && (0xFFFF & ScenarioRand()) <= 119) { @@ -5809,28 +5809,28 @@ void Guest::UpdateQueuing() { switch (AnimationGroup) { - case PeepAnimationGroup::IceCream: - case PeepAnimationGroup::Chips: - case PeepAnimationGroup::Burger: - case PeepAnimationGroup::Drink: - case PeepAnimationGroup::Candyfloss: - case PeepAnimationGroup::Pizza: - case PeepAnimationGroup::Popcorn: - case PeepAnimationGroup::HotDog: - case PeepAnimationGroup::Tentacle: - case PeepAnimationGroup::ToffeeApple: - case PeepAnimationGroup::Doughnut: - case PeepAnimationGroup::Coffee: - case PeepAnimationGroup::Chicken: - case PeepAnimationGroup::Lemonade: - case PeepAnimationGroup::Pretzel: - case PeepAnimationGroup::Sujeonggwa: - case PeepAnimationGroup::Juice: - case PeepAnimationGroup::FunnelCake: - case PeepAnimationGroup::Noodles: - case PeepAnimationGroup::Sausage: - case PeepAnimationGroup::Soup: - case PeepAnimationGroup::Sandwich: + case PeepAnimationGroup::iceCream: + case PeepAnimationGroup::chips: + case PeepAnimationGroup::burger: + case PeepAnimationGroup::drink: + case PeepAnimationGroup::candyfloss: + case PeepAnimationGroup::pizza: + case PeepAnimationGroup::popcorn: + case PeepAnimationGroup::hotDog: + case PeepAnimationGroup::tentacle: + case PeepAnimationGroup::toffeeApple: + case PeepAnimationGroup::doughnut: + case PeepAnimationGroup::coffee: + case PeepAnimationGroup::chicken: + case PeepAnimationGroup::lemonade: + case PeepAnimationGroup::pretzel: + case PeepAnimationGroup::sujeonggwa: + case PeepAnimationGroup::juice: + case PeepAnimationGroup::funnelCake: + case PeepAnimationGroup::noodles: + case PeepAnimationGroup::sausage: + case PeepAnimationGroup::soup: + case PeepAnimationGroup::sandwich: // Eat food Action = PeepActionType::eatFood; AnimationFrameNum = 0; @@ -6929,37 +6929,37 @@ struct ItemPref // clang-format off static ItemPref item_order_preference[] = { - { ShopItem::IceCream, PeepAnimationGroup::IceCream }, - { ShopItem::Chips, PeepAnimationGroup::Chips }, - { ShopItem::Pizza, PeepAnimationGroup::Pizza }, - { ShopItem::Burger, PeepAnimationGroup::Burger }, - { ShopItem::Drink, PeepAnimationGroup::Drink }, - { ShopItem::Coffee, PeepAnimationGroup::Coffee }, - { ShopItem::Chicken, PeepAnimationGroup::Chicken }, - { ShopItem::Lemonade, PeepAnimationGroup::Lemonade }, - { ShopItem::Candyfloss, PeepAnimationGroup::Candyfloss }, - { ShopItem::Popcorn, PeepAnimationGroup::Popcorn }, - { ShopItem::HotDog, PeepAnimationGroup::HotDog }, - { ShopItem::Tentacle, PeepAnimationGroup::Tentacle }, - { ShopItem::ToffeeApple, PeepAnimationGroup::ToffeeApple }, - { ShopItem::Doughnut, PeepAnimationGroup::Doughnut }, - { ShopItem::Pretzel, PeepAnimationGroup::Pretzel }, - { ShopItem::Cookie, PeepAnimationGroup::Pretzel }, - { ShopItem::Chocolate, PeepAnimationGroup::Coffee }, - { ShopItem::IcedTea, PeepAnimationGroup::Coffee }, - { ShopItem::FunnelCake, PeepAnimationGroup::FunnelCake }, - { ShopItem::BeefNoodles, PeepAnimationGroup::Noodles }, - { ShopItem::FriedRiceNoodles, PeepAnimationGroup::Noodles }, - { ShopItem::WontonSoup, PeepAnimationGroup::Soup }, - { ShopItem::MeatballSoup, PeepAnimationGroup::Soup }, - { ShopItem::FruitJuice, PeepAnimationGroup::Juice }, - { ShopItem::SoybeanMilk, PeepAnimationGroup::Sujeonggwa }, - { ShopItem::Sujeonggwa, PeepAnimationGroup::Sujeonggwa }, - { ShopItem::SubSandwich, PeepAnimationGroup::Sandwich }, - { ShopItem::RoastSausage, PeepAnimationGroup::Sausage }, - { ShopItem::Balloon, PeepAnimationGroup::Balloon }, - { ShopItem::Hat, PeepAnimationGroup::Hat }, - { ShopItem::Sunglasses, PeepAnimationGroup::Sunglasses }, + { ShopItem::IceCream, PeepAnimationGroup::iceCream }, + { ShopItem::Chips, PeepAnimationGroup::chips }, + { ShopItem::Pizza, PeepAnimationGroup::pizza }, + { ShopItem::Burger, PeepAnimationGroup::burger }, + { ShopItem::Drink, PeepAnimationGroup::drink }, + { ShopItem::Coffee, PeepAnimationGroup::coffee }, + { ShopItem::Chicken, PeepAnimationGroup::chicken }, + { ShopItem::Lemonade, PeepAnimationGroup::lemonade }, + { ShopItem::Candyfloss, PeepAnimationGroup::candyfloss }, + { ShopItem::Popcorn, PeepAnimationGroup::popcorn }, + { ShopItem::HotDog, PeepAnimationGroup::hotDog }, + { ShopItem::Tentacle, PeepAnimationGroup::tentacle }, + { ShopItem::ToffeeApple, PeepAnimationGroup::toffeeApple }, + { ShopItem::Doughnut, PeepAnimationGroup::doughnut }, + { ShopItem::Pretzel, PeepAnimationGroup::pretzel }, + { ShopItem::Cookie, PeepAnimationGroup::pretzel }, + { ShopItem::Chocolate, PeepAnimationGroup::coffee }, + { ShopItem::IcedTea, PeepAnimationGroup::coffee }, + { ShopItem::FunnelCake, PeepAnimationGroup::funnelCake }, + { ShopItem::BeefNoodles, PeepAnimationGroup::noodles }, + { ShopItem::FriedRiceNoodles, PeepAnimationGroup::noodles }, + { ShopItem::WontonSoup, PeepAnimationGroup::soup }, + { ShopItem::MeatballSoup, PeepAnimationGroup::soup }, + { ShopItem::FruitJuice, PeepAnimationGroup::juice }, + { ShopItem::SoybeanMilk, PeepAnimationGroup::sujeonggwa }, + { ShopItem::Sujeonggwa, PeepAnimationGroup::sujeonggwa }, + { ShopItem::SubSandwich, PeepAnimationGroup::sandwich }, + { ShopItem::RoastSausage, PeepAnimationGroup::sausage }, + { ShopItem::Balloon, PeepAnimationGroup::balloon }, + { ShopItem::Hat, PeepAnimationGroup::hat }, + { ShopItem::Sunglasses, PeepAnimationGroup::sunglasses }, }; // clang-format on @@ -6969,7 +6969,7 @@ static ItemPref item_order_preference[] = { */ void Guest::UpdateAnimationGroup() { - if (AnimationGroup == PeepAnimationGroup::Balloon && (ScenarioRand() & 0xFFFF) <= 327) + if (AnimationGroup == PeepAnimationGroup::balloon && (ScenarioRand() & 0xFFFF) <= 327) { bool isBalloonPopped = false; if (x != kLocationNull) @@ -7000,7 +7000,7 @@ void Guest::UpdateAnimationGroup() if (tileElement->IsLastForTile()) { - SetAnimationGroup(PeepAnimationGroup::Umbrella); + SetAnimationGroup(PeepAnimationGroup::umbrella); return; } tileElement++; @@ -7019,41 +7019,41 @@ void Guest::UpdateAnimationGroup() if (State == PeepState::watching && StandingFlags & (1 << 1)) { - SetAnimationGroup(PeepAnimationGroup::Watching); + SetAnimationGroup(PeepAnimationGroup::watching); return; } if (Nausea > 170) { - SetAnimationGroup(PeepAnimationGroup::VeryNauseous); + SetAnimationGroup(PeepAnimationGroup::veryNauseous); return; } if (Nausea > 140) { - SetAnimationGroup(PeepAnimationGroup::Nauseous); + SetAnimationGroup(PeepAnimationGroup::nauseous); return; } if (Energy <= 64 && Happiness < 128) { - SetAnimationGroup(PeepAnimationGroup::HeadDown); + SetAnimationGroup(PeepAnimationGroup::headDown); return; } if (Energy <= 80 && Happiness < 128) { - SetAnimationGroup(PeepAnimationGroup::ArmsCrossed); + SetAnimationGroup(PeepAnimationGroup::armsCrossed); return; } if (Toilet > 220) { - SetAnimationGroup(PeepAnimationGroup::RequireToilet); + SetAnimationGroup(PeepAnimationGroup::requireToilet); return; } - SetAnimationGroup(PeepAnimationGroup::Normal); + SetAnimationGroup(PeepAnimationGroup::normal); } bool Guest::HeadingForRideOrParkExit() const @@ -7273,7 +7273,7 @@ Guest* Guest::Generate(const CoordsXYZ& coords) Guest* peep = gameState.entities.CreateEntity(); peep->AnimationObjectIndex = findPeepAnimationsIndexForType(AnimationPeepType::guest); - peep->AnimationGroup = PeepAnimationGroup::Normal; + peep->AnimationGroup = PeepAnimationGroup::normal; peep->OutsideOfPark = true; peep->State = PeepState::falling; peep->Action = PeepActionType::walking; diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 11aa1cf4f1..5a64d358dc 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -2630,7 +2630,7 @@ static void GuestReleaseBalloon(Guest* peep, int16_t spawn_height) { peep->RemoveItem(ShopItem::Balloon); - if (peep->AnimationGroup == PeepAnimationGroup::Balloon && peep->x != kLocationNull) + if (peep->AnimationGroup == PeepAnimationGroup::balloon && peep->x != kLocationNull) { Balloon::Create({ peep->x, peep->y, spawn_height }, peep->BalloonColour, false); peep->WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY; @@ -2794,7 +2794,7 @@ void Peep::Paint(PaintSession& session, int32_t imageDirection) const else if (actionAnimationGroup == PeepAnimationType::sittingIdle) itemFrame = 7; - if (AnimationGroup == PeepAnimationGroup::Hat) + if (AnimationGroup == PeepAnimationGroup::hat) { auto itemOffset = kPeepSpriteHatItemStart; imageId = ImageId(itemOffset + (imageDirection >> 3) + itemFrame * 4, guest->HatColour); @@ -2802,7 +2802,7 @@ void Peep::Paint(PaintSession& session, int32_t imageDirection) const return; } - if (AnimationGroup == PeepAnimationGroup::Balloon) + if (AnimationGroup == PeepAnimationGroup::balloon) { auto itemOffset = kPeepSpriteBalloonItemStart; imageId = ImageId(itemOffset + (imageDirection >> 3) + itemFrame * 4, guest->BalloonColour); @@ -2810,7 +2810,7 @@ void Peep::Paint(PaintSession& session, int32_t imageDirection) const return; } - if (AnimationGroup == PeepAnimationGroup::Umbrella) + if (AnimationGroup == PeepAnimationGroup::umbrella) { auto itemOffset = kPeepSpriteUmbrellaItemStart; imageId = ImageId(itemOffset + (imageDirection >> 3) + itemFrame * 4, guest->UmbrellaColour); diff --git a/src/openrct2/entity/Peep.h b/src/openrct2/entity/Peep.h index a1f8d83cce..40140b6ac4 100644 --- a/src/openrct2/entity/Peep.h +++ b/src/openrct2/entity/Peep.h @@ -238,46 +238,46 @@ enum PeepNextFlags enum class PeepAnimationGroup : uint8_t { - Normal = 0, + normal = 0, // Security staff - Alternate = 1, + alternate = 1, // Guest variations - IceCream = 1, - Chips = 2, - Burger = 3, - Drink = 4, - Balloon = 5, - Candyfloss = 6, - Umbrella = 7, - Pizza = 8, - Popcorn = 9, - ArmsCrossed = 10, - HeadDown = 11, - Nauseous = 12, - VeryNauseous = 13, - RequireToilet = 14, - Hat = 15, - HotDog = 16, - Tentacle = 17, - ToffeeApple = 18, - Doughnut = 19, - Coffee = 20, - Chicken = 21, - Lemonade = 22, - Watching = 23, - Pretzel = 24, - Sunglasses = 25, - Sujeonggwa = 26, - Juice = 27, - FunnelCake = 28, - Noodles = 29, - Sausage = 30, - Soup = 31, - Sandwich = 32, + iceCream = 1, + chips = 2, + burger = 3, + drink = 4, + balloon = 5, + candyfloss = 6, + umbrella = 7, + pizza = 8, + popcorn = 9, + armsCrossed = 10, + headDown = 11, + nauseous = 12, + veryNauseous = 13, + requireToilet = 14, + hat = 15, + hotDog = 16, + tentacle = 17, + toffeeApple = 18, + doughnut = 19, + coffee = 20, + chicken = 21, + lemonade = 22, + watching = 23, + pretzel = 24, + sunglasses = 25, + sujeonggwa = 26, + juice = 27, + funnelCake = 28, + noodles = 29, + sausage = 30, + soup = 31, + sandwich = 32, - Invalid = 255 + invalid = 255 }; // Flags used by peep->WindowInvalidateFlags diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index 0947efd08f..ecede9916a 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -1696,9 +1696,9 @@ void Staff::Tick128UpdateStaff() return; // Alternate between walking animations based on crowd size - auto newAnimationGroup = PeepAnimationGroup::Normal; + auto newAnimationGroup = PeepAnimationGroup::normal; if (State == PeepState::patrolling && SecurityGuardPathIsCrowded()) - newAnimationGroup = PeepAnimationGroup::Alternate; + newAnimationGroup = PeepAnimationGroup::alternate; if (AnimationGroup == newAnimationGroup) return; diff --git a/src/openrct2/object/PeepAnimationsObject.cpp b/src/openrct2/object/PeepAnimationsObject.cpp index 0387f1b62e..715cdc35ad 100644 --- a/src/openrct2/object/PeepAnimationsObject.cpp +++ b/src/openrct2/object/PeepAnimationsObject.cpp @@ -51,7 +51,7 @@ namespace OpenRCT2 // algorithm doesn't account for those. We manually compensate for these here. // Between 8-12 pixels are needed, depending on rotation, so we're generalising. auto pag = PeepAnimationGroup(groupKey); - if (pag == PeepAnimationGroup::Balloon || pag == PeepAnimationGroup::Hat || pag == PeepAnimationGroup::Umbrella) + if (pag == PeepAnimationGroup::balloon || pag == PeepAnimationGroup::hat || pag == PeepAnimationGroup::umbrella) { group[typeEnum].bounds.spriteHeightNegative += 12; } diff --git a/src/openrct2/scripting/bindings/entity/ScStaff.cpp b/src/openrct2/scripting/bindings/entity/ScStaff.cpp index 12d437b606..6f4796d409 100644 --- a/src/openrct2/scripting/bindings/entity/ScStaff.cpp +++ b/src/openrct2/scripting/bindings/entity/ScStaff.cpp @@ -79,25 +79,25 @@ namespace OpenRCT2::Scripting { peep->AssignedStaffType = StaffType::Handyman; peep->AnimationObjectIndex = findPeepAnimationsIndexForType(AnimationPeepType::handyman); - peep->AnimationGroup = PeepAnimationGroup::Normal; + peep->AnimationGroup = PeepAnimationGroup::normal; } else if (value == "mechanic" && !peep->IsMechanic()) { peep->AssignedStaffType = StaffType::Mechanic; peep->AnimationObjectIndex = findPeepAnimationsIndexForType(AnimationPeepType::mechanic); - peep->AnimationGroup = PeepAnimationGroup::Normal; + peep->AnimationGroup = PeepAnimationGroup::normal; } else if (value == "security" && peep->AssignedStaffType != StaffType::Security) { peep->AssignedStaffType = StaffType::Security; peep->AnimationObjectIndex = findPeepAnimationsIndexForType(AnimationPeepType::security); - peep->AnimationGroup = PeepAnimationGroup::Normal; + peep->AnimationGroup = PeepAnimationGroup::normal; } else if (value == "entertainer" && !peep->isEntertainer()) { peep->AssignedStaffType = StaffType::Entertainer; peep->AnimationObjectIndex = findPeepAnimationsIndexForType(AnimationPeepType::entertainer); - peep->AnimationGroup = PeepAnimationGroup::Normal; + peep->AnimationGroup = PeepAnimationGroup::normal; } // Reset state to walking to prevent invalid actions from carrying over