Flat diagonal Hybrid Coaster track draws in incorrect colour

[Basssiiie]

Operating System

Windows 10, 64-bit

OpenRCT2 build

OpenRCT2, v0.4.11-111-g2217d40 (2217d40 on develop) provided by GitHub

Base game

RollerCoaster Tycoon 2

Area(s) with this issue?

This bug is a graphical glitch or error

Describe the issue

The flat diagonal track piece for the Hybrid Coaster draws the side bars in the wrong colour. The issue happens in all placement rotations and viewing rotations.

Other similar track pieces, like banked pieces, brakes, and block brakes look fine.

Steps to reproduce

1. Build a flat diagonal track piece for the Hybrid Coaster.
2. Make sure the track and supports are of different colours.

Attachments

[AaronVanGeffen]

The sprites themselves look like they have both remap colours. It seems HybridRC::TrackDiagFlat may need to be adjusted. Perhaps HybridRC::TrackDiagBrakes can help act as reference.

[Gymnasiast]

Probably caused by a recent refactor to that function. Need to figure out how to fix it without just reverting.