From 42d137f4a9513c395f281d849dbbf887ec9443b5 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sun, 3 Oct 2021 15:20:08 -0500 Subject: [PATCH] DECLARE_ASSET_ARRAY_SETGET is incompatible with INITPERSISTFIELD_SOUNDASSET_ENUMED --- Engine/source/T3D/vehicles/hoverVehicle.h | 1 - Engine/source/T3D/vehicles/vehicle.h | 2 -- Engine/source/T3D/vehicles/wheeledVehicle.h | 1 - 3 files changed, 4 deletions(-) diff --git a/Engine/source/T3D/vehicles/hoverVehicle.h b/Engine/source/T3D/vehicles/hoverVehicle.h index 8e7cce79b..8f666a76a 100644 --- a/Engine/source/T3D/vehicles/hoverVehicle.h +++ b/Engine/source/T3D/vehicles/hoverVehicle.h @@ -47,7 +47,6 @@ class HoverVehicleData : public VehicleData MaxSounds }; DECLARE_SOUNDASSET_ARRAY(HoverVehicleData, HoverSounds, Sounds::MaxSounds); - DECLARE_ASSET_ARRAY_SETGET(HoverVehicleData, HoverSounds); SFXProfile* getHoverSoundProfile(U32 id) { if (mHoverSoundsAsset[id] != NULL) diff --git a/Engine/source/T3D/vehicles/vehicle.h b/Engine/source/T3D/vehicles/vehicle.h index c9a50b831..2e6440662 100644 --- a/Engine/source/T3D/vehicles/vehicle.h +++ b/Engine/source/T3D/vehicles/vehicle.h @@ -50,7 +50,6 @@ struct VehicleData : public RigidShapeData } body; DECLARE_SOUNDASSET_ARRAY(VehicleData, VehicleBodySounds, Body::Sounds::MaxSounds) - DECLARE_ASSET_ARRAY_SETGET(VehicleData, VehicleBodySounds); SFXProfile* getVehicleBodySoundProfile(U32 id) { @@ -82,7 +81,6 @@ struct VehicleData : public RigidShapeData }; DECLARE_SOUNDASSET_ARRAY(VehicleData, VehicleWaterSounds, Sounds::MaxSounds) - DECLARE_ASSET_ARRAY_SETGET(VehicleData, VehicleWaterSounds); SFXProfile* getVehicleWaterSoundProfile(U32 id) { diff --git a/Engine/source/T3D/vehicles/wheeledVehicle.h b/Engine/source/T3D/vehicles/wheeledVehicle.h index c8759e52d..56f5997a9 100644 --- a/Engine/source/T3D/vehicles/wheeledVehicle.h +++ b/Engine/source/T3D/vehicles/wheeledVehicle.h @@ -120,7 +120,6 @@ struct WheeledVehicleData: public VehicleData }; DECLARE_SOUNDASSET_ARRAY(WheeledVehicleData, WheeledVehicleSounds, Sounds::MaxSounds); - DECLARE_ASSET_ARRAY_SETGET(WheeledVehicleData, WheeledVehicleSounds); SFXProfile* getWheeledVehicleSound(U32 id) {