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

Rework rct_vehicle_colour (#16051)

Browse Source 
* Remove rct_vehicle_colour and replace with VehicleColour

* Update network version

* Update replay version
This commit is contained in:
Duncan
2022-08-13 20:30:30 +01:00
committed by GitHub
parent 49215a52cf
commit adc51ad9aa
31 changed files with 88 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2/scripting/bindings/entity/ScVehicle.cpp
View File

@@ -337,11 +337,7 @@ namespace OpenRCT2::Scripting
auto vehicle = GetVehicle();
if (vehicle != nullptr)
{
VehicleColour colours;
colours.Body = vehicle->colours.body_colour;
colours.Trim = vehicle->colours.trim_colour;
colours.Tertiary = vehicle->colours_extended;
return ToDuk<VehicleColour>(ctx, colours);
return ToDuk<VehicleColour>(ctx, vehicle->colours);
}
return ToDuk(ctx, nullptr);
}
@@ -351,10 +347,7 @@ namespace OpenRCT2::Scripting
auto vehicle = GetVehicle();
if (vehicle != nullptr)
{
auto colours = FromDuk<VehicleColour>(value);
vehicle->colours.body_colour = colours.Body;
vehicle->colours.trim_colour = colours.Trim;
vehicle->colours_extended = colours.Tertiary;
vehicle->colours = FromDuk<VehicleColour>(value);
}
}