From ce95b58d5e112832809337fa5d7b4a8d816be006 Mon Sep 17 00:00:00 2001
From: spacek531 <spacek531@comcast.net>
Date: Thu, 8 Sep 2022 23:23:56 -0700
Subject: [PATCH] Fix #17992: Virginia Reel doesn't show sloped tracks

---
 src/openrct2/object/RideObject.cpp | 37 ++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp
index 5b3488f582..99ab163ab4 100644
--- a/src/openrct2/object/RideObject.cpp
+++ b/src/openrct2/object/RideObject.cpp
@@ -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;