ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

Various fixes for Vehicle Extras. (#2019)

Browse Source
This commit is contained in:
gir489
2023-08-25 02:53:24 -04:00
committed by GitHub
parent e1a2ee21ea
commit b19cf9c26d
3 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/services/vehicle/persist_car_service.cpp
View File

@ -219,10 +219,9 @@ namespace big
VEHICLE::SET_VEHICLE_EXTRA_COLOURS(vehicle, vehicle_json[pearlescent_color_key], vehicle_json[wheel_color_key]);
std::map<int, bool> vehicle_extras = vehicle_json[vehicle_extras_key];
for (int i = 0; i <= 20; i++)
for (const auto& [extra, extra_enabled] : vehicle_extras)
{
if (VEHICLE::DOES_EXTRA_EXIST(vehicle, i))
VEHICLE::SET_VEHICLE_EXTRA(vehicle, i, vehicle_extras[i]);
VEHICLE::SET_VEHICLE_EXTRA(vehicle, extra, extra_enabled);
}
if (!vehicle_json[vehicle_livery_key].is_null())
@ -446,10 +445,12 @@ namespace big
vehicle_json[wheel_color_key] = wheel_color;
std::map<int, bool> vehicle_extras;
for (int i = 0; i <= 20; i++)
for (int extra_iterator = 0; extra_iterator <= 14; extra_iterator++)
{
if (VEHICLE::DOES_EXTRA_EXIST(vehicle, i))
vehicle_extras[i] = !VEHICLE::IS_VEHICLE_EXTRA_TURNED_ON(vehicle, i);
if (VEHICLE::DOES_EXTRA_EXIST(vehicle, extra_iterator))
{
vehicle_extras[extra_iterator] = !VEHICLE::IS_VEHICLE_EXTRA_TURNED_ON(vehicle, extra_iterator);
}
}
vehicle_json[vehicle_extras_key] = vehicle_extras;