From 4507d3e5c49ef91ce4295689bdc7db5ba31206fb Mon Sep 17 00:00:00 2001 From: spacek531 Date: Wed, 17 May 2023 11:41:23 -0700 Subject: [PATCH] fix restraints with 8 angles (#20197) --- src/openrct2/ride/VehiclePaint.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/openrct2/ride/VehiclePaint.cpp b/src/openrct2/ride/VehiclePaint.cpp index 134d075bd4..4607803efb 100644 --- a/src/openrct2/ride/VehiclePaint.cpp +++ b/src/openrct2/ride/VehiclePaint.cpp @@ -1036,10 +1036,8 @@ static void VehicleSpritePaintRestraints( PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) { int32_t boundingBoxNum = YawTo16(imageDirection); - auto restraintFrame = ((vehicle->restraints_position - 64) / 64) * 4; - auto spriteNum = (carEntry->SpriteByYaw(imageDirection, SpriteGroupType::RestraintAnimation) + restraintFrame) - * carEntry->base_num_frames - + carEntry->GroupImageId(SpriteGroupType::RestraintAnimation); + auto restraintFrame = ((vehicle->restraints_position - 64) / 64); + auto spriteNum = carEntry->SpriteOffset(SpriteGroupType::RestraintAnimation, imageDirection, restraintFrame); vehicle_sprite_paint(session, vehicle, spriteNum, VehicleBoundboxes[carEntry->draw_order][boundingBoxNum], z, carEntry); }