diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 704ba3f57f..7efc28b02b 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -251,9 +251,9 @@ struct GameStateSnapshots final : public IGameStateSnapshots COMPARE_FIELD(EntityBase, y); COMPARE_FIELD(EntityBase, z); /* Only relevant for rendering, does not affect game state. - COMPARE_FIELD(SpriteBase, sprite_width); - COMPARE_FIELD(SpriteBase, sprite_height_negative); - COMPARE_FIELD(SpriteBase, sprite_height_positive); + COMPARE_FIELD(SpriteBase, spriteWidth); + COMPARE_FIELD(SpriteBase, spriteHeightNegative); + COMPARE_FIELD(SpriteBase, spriteHeightPositive); COMPARE_FIELD(SpriteBase, sprite_left); COMPARE_FIELD(SpriteBase, sprite_top); COMPARE_FIELD(SpriteBase, sprite_right); diff --git a/src/openrct2/actions/StaffHireNewAction.cpp b/src/openrct2/actions/StaffHireNewAction.cpp index 7a7d6a746a..96098bdb39 100644 --- a/src/openrct2/actions/StaffHireNewAction.cpp +++ b/src/openrct2/actions/StaffHireNewAction.cpp @@ -165,9 +165,9 @@ namespace OpenRCT2::GameActions newPeep->PeepFlags |= PEEP_FLAGS_SLOW_WALK; const auto& spriteBounds = animObj->GetSpriteBounds(newPeep->AnimationGroup); - newPeep->SpriteData.Width = spriteBounds.sprite_width; - newPeep->SpriteData.HeightMin = spriteBounds.sprite_height_negative; - newPeep->SpriteData.HeightMax = spriteBounds.sprite_height_positive; + newPeep->SpriteData.Width = spriteBounds.spriteWidth; + newPeep->SpriteData.HeightMin = spriteBounds.spriteHeightNegative; + newPeep->SpriteData.HeightMax = spriteBounds.spriteHeightPositive; if (_autoPosition) { diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index b0d206e40d..951c5de6d1 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -7289,9 +7289,9 @@ Guest* Guest::Generate(const CoordsXYZ& coords) auto* animObj = objManager.GetLoadedObject(peep->AnimationObjectIndex); const auto& spriteBounds = animObj->GetSpriteBounds(peep->AnimationGroup, peep->AnimationType); - peep->SpriteData.Width = spriteBounds.sprite_width; - peep->SpriteData.HeightMin = spriteBounds.sprite_height_negative; - peep->SpriteData.HeightMax = spriteBounds.sprite_height_positive; + peep->SpriteData.Width = spriteBounds.spriteWidth; + peep->SpriteData.HeightMin = spriteBounds.spriteHeightNegative; + peep->SpriteData.HeightMax = spriteBounds.spriteHeightPositive; peep->Orientation = 0; peep->MoveTo(coords); diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 2063dd9cb8..ab62b8fe4f 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -379,9 +379,9 @@ void Peep::UpdateSpriteBoundingBox() auto* animObj = objManager.GetLoadedObject(AnimationObjectIndex); const auto& spriteBounds = animObj->GetSpriteBounds(AnimationGroup, AnimationType); - SpriteData.Width = spriteBounds.sprite_width; - SpriteData.HeightMin = spriteBounds.sprite_height_negative; - SpriteData.HeightMax = spriteBounds.sprite_height_positive; + SpriteData.Width = spriteBounds.spriteWidth; + SpriteData.HeightMin = spriteBounds.spriteHeightNegative; + SpriteData.HeightMax = spriteBounds.spriteHeightPositive; } /* rct2: 0x00693BE5 */ @@ -1579,9 +1579,9 @@ void Peep::SwitchNextAnimationType() auto* animObj = objManager.GetLoadedObject(AnimationObjectIndex); const auto& spriteBounds = animObj->GetSpriteBounds(AnimationGroup, NextAnimationType); - SpriteData.Width = spriteBounds.sprite_width; - SpriteData.HeightMin = spriteBounds.sprite_height_negative; - SpriteData.HeightMax = spriteBounds.sprite_height_positive; + SpriteData.Width = spriteBounds.spriteWidth; + SpriteData.HeightMin = spriteBounds.spriteHeightNegative; + SpriteData.HeightMax = spriteBounds.spriteHeightPositive; Invalidate(); } } diff --git a/src/openrct2/object/PeepAnimationsObject.cpp b/src/openrct2/object/PeepAnimationsObject.cpp index 2a9590046d..cc19a8d2ef 100644 --- a/src/openrct2/object/PeepAnimationsObject.cpp +++ b/src/openrct2/object/PeepAnimationsObject.cpp @@ -53,7 +53,7 @@ namespace OpenRCT2 auto pag = PeepAnimationGroup(groupKey); if (pag == PeepAnimationGroup::Balloon || pag == PeepAnimationGroup::Hat || pag == PeepAnimationGroup::Umbrella) { - group[typeEnum].bounds.sprite_height_negative += 12; + group[typeEnum].bounds.spriteHeightNegative += 12; } } } diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index 299973daf6..a9f2b07b79 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -430,9 +430,9 @@ namespace OpenRCT2 car.num_seats = stream->ReadValue(); CarSpriteFlags carSpriteFlags; carSpriteFlags.holder = stream->ReadValue(); - car.sprite_width = stream->ReadValue(); - car.sprite_height_negative = stream->ReadValue(); - car.sprite_height_positive = stream->ReadValue(); + car.spriteWidth = stream->ReadValue(); + car.spriteHeightNegative = stream->ReadValue(); + car.spriteHeightPositive = stream->ReadValue(); auto legacyAnimation = stream->ReadValue(); car.flags = stream->ReadValue(); // Implied in vanilla, but can be turned off in OpenRCT2. @@ -590,9 +590,9 @@ namespace OpenRCT2 auto& car = _legacyType.Cars[0]; car.spacing = 544; car.SpriteGroups[EnumValue(SpriteGroupType::SlopeFlat)].spritePrecision = SpritePrecision::Sprites4; - car.sprite_width = 1; - car.sprite_height_negative = 1; - car.sprite_height_positive = 1; + car.spriteWidth = 1; + car.spriteHeightNegative = 1; + car.spriteHeightPositive = 1; car.flags = CAR_ENTRY_FLAG_SPINNING; car.PaintStyle = VEHICLE_VISUAL_FLAT_RIDE_OR_CAR_RIDE; car.friction_sound_id = OpenRCT2::Audio::SoundId::null; @@ -745,9 +745,9 @@ namespace OpenRCT2 car.num_seats |= kVehicleSeatPairFlag; } - car.sprite_width = Json::GetNumber(jCar["spriteWidth"]); - car.sprite_height_negative = Json::GetNumber(jCar["spriteHeightNegative"]); - car.sprite_height_positive = Json::GetNumber(jCar["spriteHeightPositive"]); + car.spriteWidth = Json::GetNumber(jCar["spriteWidth"]); + car.spriteHeightNegative = Json::GetNumber(jCar["spriteHeightNegative"]); + car.spriteHeightPositive = Json::GetNumber(jCar["spriteHeightPositive"]); car.base_num_frames = Json::GetNumber(jCar["baseNumFrames"]); car.NumCarImages = Json::GetNumber(jCar["numImages"]); car.no_seating_rows = Json::GetNumber(jCar["numSeatRows"]); diff --git a/src/openrct2/peep/PeepAnimations.cpp b/src/openrct2/peep/PeepAnimations.cpp index 22a6e2afd1..f3eda41349 100644 --- a/src/openrct2/peep/PeepAnimations.cpp +++ b/src/openrct2/peep/PeepAnimations.cpp @@ -369,9 +369,9 @@ namespace OpenRCT2 spriteHeightPositive++; return { - .sprite_width = static_cast(spriteWidth), - .sprite_height_negative = static_cast(spriteHeightNegative), - .sprite_height_positive = static_cast(spriteHeightPositive), + .spriteWidth = static_cast(spriteWidth), + .spriteHeightNegative = static_cast(spriteHeightNegative), + .spriteHeightPositive = static_cast(spriteHeightPositive), }; } } // namespace OpenRCT2 diff --git a/src/openrct2/peep/PeepAnimations.h b/src/openrct2/peep/PeepAnimations.h index 1a48d45e0b..a5c83e7379 100644 --- a/src/openrct2/peep/PeepAnimations.h +++ b/src/openrct2/peep/PeepAnimations.h @@ -38,9 +38,9 @@ namespace OpenRCT2 struct SpriteBounds { - uint8_t sprite_width; // 0x00 - uint8_t sprite_height_negative; // 0x01 - uint8_t sprite_height_positive; // 0x02 + uint8_t spriteWidth; // 0x00 + uint8_t spriteHeightNegative; // 0x01 + uint8_t spriteHeightPositive; // 0x02 }; struct PeepAnimation diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index b5f4e9f1e7..df20739397 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1278,9 +1278,9 @@ namespace OpenRCT2::RCT1 for (auto* peep : EntityList()) { const auto& spriteBounds = animObj->GetSpriteBounds(peep->AnimationGroup, peep->AnimationType); - peep->SpriteData.Width = spriteBounds.sprite_width; - peep->SpriteData.HeightMin = spriteBounds.sprite_height_negative; - peep->SpriteData.HeightMax = spriteBounds.sprite_height_positive; + peep->SpriteData.Width = spriteBounds.spriteWidth; + peep->SpriteData.HeightMin = spriteBounds.spriteHeightNegative; + peep->SpriteData.HeightMax = spriteBounds.spriteHeightPositive; } auto& objManager = GetContext()->GetObjectManager(); @@ -1288,9 +1288,9 @@ namespace OpenRCT2::RCT1 { animObj = objManager.GetLoadedObject(peep->AnimationObjectIndex); const auto& spriteBounds = animObj->GetSpriteBounds(peep->AnimationGroup, peep->AnimationType); - peep->SpriteData.Width = spriteBounds.sprite_width; - peep->SpriteData.HeightMin = spriteBounds.sprite_height_negative; - peep->SpriteData.HeightMax = spriteBounds.sprite_height_positive; + peep->SpriteData.Width = spriteBounds.spriteWidth; + peep->SpriteData.HeightMin = spriteBounds.spriteHeightNegative; + peep->SpriteData.HeightMax = spriteBounds.spriteHeightPositive; } } diff --git a/src/openrct2/ride/CarEntry.cpp b/src/openrct2/ride/CarEntry.cpp index 2a1b1360ab..028978beb8 100644 --- a/src/openrct2/ride/CarEntry.cpp +++ b/src/openrct2/ride/CarEntry.cpp @@ -138,9 +138,9 @@ void CarEntrySetImageMaxSizes(CarEntry& carEntry, int32_t numImages) spriteHeightNegative += 16; } - carEntry.sprite_width = spriteWidth; - carEntry.sprite_height_negative = spriteHeightNegative; - carEntry.sprite_height_positive = spriteHeightPositive; + carEntry.spriteWidth = spriteWidth; + carEntry.spriteHeightNegative = spriteHeightNegative; + carEntry.spriteHeightPositive = spriteHeightPositive; } bool CarEntry::isVisible() const diff --git a/src/openrct2/ride/CarEntry.h b/src/openrct2/ride/CarEntry.h index 2ed0ab62d3..1e65ca613f 100644 --- a/src/openrct2/ride/CarEntry.h +++ b/src/openrct2/ride/CarEntry.h @@ -179,9 +179,9 @@ struct CarEntry uint16_t car_mass; int8_t tab_height; uint8_t num_seats; - uint8_t sprite_width; - uint8_t sprite_height_negative; - uint8_t sprite_height_positive; + uint8_t spriteWidth; + uint8_t spriteHeightNegative; + uint8_t spriteHeightPositive; CarEntryAnimation animation; uint64_t flags; uint16_t base_num_frames; // The number of sprites of animation or swinging per rotation frame diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 02a9eaf890..d592314e86 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -3298,9 +3298,9 @@ static Vehicle* VehicleCreateCar( } // Loc6DD9A5: - vehicle->SpriteData.Width = carEntry.sprite_width; - vehicle->SpriteData.HeightMin = carEntry.sprite_height_negative; - vehicle->SpriteData.HeightMax = carEntry.sprite_height_positive; + vehicle->SpriteData.Width = carEntry.spriteWidth; + vehicle->SpriteData.HeightMin = carEntry.spriteHeightNegative; + vehicle->SpriteData.HeightMax = carEntry.spriteHeightPositive; vehicle->mass = carEntry.car_mass; vehicle->num_seats = carEntry.num_seats; vehicle->speed = carEntry.powered_max_speed; @@ -5554,15 +5554,15 @@ void FixInvalidVehicleSpriteSizes() if (vehicle->SpriteData.Width == 0) { - vehicle->SpriteData.Width = carEntry->sprite_width; + vehicle->SpriteData.Width = carEntry->spriteWidth; } if (vehicle->SpriteData.HeightMin == 0) { - vehicle->SpriteData.HeightMin = carEntry->sprite_height_negative; + vehicle->SpriteData.HeightMin = carEntry->spriteHeightNegative; } if (vehicle->SpriteData.HeightMax == 0) { - vehicle->SpriteData.HeightMax = carEntry->sprite_height_positive; + vehicle->SpriteData.HeightMax = carEntry->spriteHeightPositive; } } } diff --git a/src/openrct2/ride/RideData.cpp b/src/openrct2/ride/RideData.cpp index 6f56d7658f..172f2d7098 100644 --- a/src/openrct2/ride/RideData.cpp +++ b/src/openrct2/ride/RideData.cpp @@ -135,9 +135,9 @@ const CarEntry kCableLiftVehicle = { .car_mass = 0, .tab_height = 0, .num_seats = 0, - .sprite_width = 0, - .sprite_height_negative = 0, - .sprite_height_positive = 0, + .spriteWidth = 0, + .spriteHeightNegative = 0, + .spriteHeightPositive = 0, .animation = CarEntryAnimation::None, .flags = 0, .base_num_frames = 1, diff --git a/src/openrct2/scripting/bindings/object/ScObject.hpp b/src/openrct2/scripting/bindings/object/ScObject.hpp index 10053f72d7..c350cfb55b 100644 --- a/src/openrct2/scripting/bindings/object/ScObject.hpp +++ b/src/openrct2/scripting/bindings/object/ScObject.hpp @@ -250,7 +250,7 @@ namespace OpenRCT2::Scripting auto entry = GetEntry(); if (entry != nullptr) { - return entry->sprite_width; + return entry->spriteWidth; } return 0; } @@ -260,7 +260,7 @@ namespace OpenRCT2::Scripting auto entry = GetEntry(); if (entry != nullptr) { - return entry->sprite_height_negative; + return entry->spriteHeightNegative; } return 0; } @@ -270,7 +270,7 @@ namespace OpenRCT2::Scripting auto entry = GetEntry(); if (entry != nullptr) { - return entry->sprite_height_positive; + return entry->spriteHeightPositive; } return 0; }