mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 13:33:02 +01:00
Code Issues Releases Wiki Activity

Fix #17992: Virginia Reel doesn't show sloped tracks

Browse Source
This commit is contained in:
spacek531
2022-09-08 23:23:56 -07:00
committed by GitHub
parent 4f0f6608f4
commit ce95b58d5e
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/openrct2/object/RideObject.cpp
View File

@@ -42,6 +42,8 @@ static const uint8_t SpriteGroupMultiplier[EnumValue(SpriteGroupType::Count)] =
1, 2, 2, 2, 2, 2, 2, 10, 1, 2, 2, 2, 2, 2, 2, 2, 6, 4, 4, 4, 4, 4, 4, 4, 12, 4, 4, 4, 4, 4, 20, 3, 1,
};
static constexpr uint8_t RiverRapidsNumSpinningSprites = 8;
static constexpr SpritePrecision PrecisionFromNumFrames(uint8_t numRotationFrames)
{
if (numRotationFrames == 0)
@@ -229,16 +231,33 @@ void RideObject::Load()
uint32_t imageIndex = baseImageId;
carEntry->base_image_id = baseImageId;
for (uint8_t spriteGroup = 0; spriteGroup < EnumValue(SpriteGroupType::Count); spriteGroup++)
switch (carEntry->PaintStyle)
{
if (carEntry->SpriteGroups[spriteGroup].Enabled())
{
carEntry->SpriteGroups[spriteGroup].imageId = imageIndex;
const auto spriteCount = carEntry->base_num_frames
* carEntry->NumRotationSprites(static_cast<SpriteGroupType>(spriteGroup))
* SpriteGroupMultiplier[spriteGroup];
imageIndex += spriteCount;
}
case VEHICLE_VISUAL_RIVER_RAPIDS:
case VEHICLE_VISUAL_VIRGINIA_REEL:
// Paint code for these rides do not use sprite groups but #17909 requires them. Dummy sprite groups are
// added.
carEntry->SpriteGroups[EnumValue(SpriteGroupType::SlopeFlat)] = { baseImageId, SpritePrecision::Sprites1 };
carEntry->SpriteGroups[EnumValue(SpriteGroupType::Slopes12)] = {
baseImageId + RiverRapidsNumSpinningSprites, SpritePrecision::Sprites4
};
carEntry->SpriteGroups[EnumValue(SpriteGroupType::Slopes25)] = {
baseImageId + RiverRapidsNumSpinningSprites + RiverRapidsNumSpinningSprites * NumOrthogonalDirections,
SpritePrecision::Sprites4
};
break;
default:
for (uint8_t spriteGroup = 0; spriteGroup < EnumValue(SpriteGroupType::Count); spriteGroup++)
{
if (carEntry->SpriteGroups[spriteGroup].Enabled())
{
carEntry->SpriteGroups[spriteGroup].imageId = imageIndex;
const auto spriteCount = carEntry->base_num_frames
* carEntry->NumRotationSprites(static_cast<SpriteGroupType>(spriteGroup))
* SpriteGroupMultiplier[spriteGroup];
imageIndex += spriteCount;
}
}
}
carEntry->NumCarImages = imageIndex - currentCarImagesOffset;