From 64a87ceba8a0d76b20c2efc60039d887f0131b12 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Thu, 30 Sep 2021 13:46:03 -0500 Subject: [PATCH] trim assetEnumNameConcat to 2 values, set INITPERSISTFIELD_SOUNDASSET_ENUMED to exclude maxValue --- Engine/source/T3D/assets/SoundAsset.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Engine/source/T3D/assets/SoundAsset.h b/Engine/source/T3D/assets/SoundAsset.h index 7bbbcdc15..44817eb72 100644 --- a/Engine/source/T3D/assets/SoundAsset.h +++ b/Engine/source/T3D/assets/SoundAsset.h @@ -374,14 +374,14 @@ DefineEngineMethod(className, set##name, bool, (const char* shape), , assetText #pragma endregion -#define assetEnumNameConcat(x,suff,ForT)(new std::string(std::string(#x) + suff + std::string(#ForT)))->c_str() +#define assetEnumNameConcat(x,suff)(new std::string( x + std::string(#suff)))->c_str() #define INITPERSISTFIELD_SOUNDASSET_ENUMED(name, enumType, maxValue, consoleClass, docs) \ - for (U32 i = 0; i <= maxValue; i++)\ + for (U32 i = 0; i < maxValue; i++)\ {\ const char* enumString = castConsoleTypeToString(static_cast(i));\ - addProtectedField(assetEnumNameConcat(name,enumString, File), TypeSoundFilename, Offset(m##name##Name[i], consoleClass), _set##name##Data, & defaultProtectedGetFn, assetText(name, docs), AbstractClassRep::FIELD_HideInInspectors); \ - addProtectedField(assetEnumNameConcat(name,enumString, Asset), TypeSoundAssetId, Offset(m##name##AssetId[i], consoleClass), _set##name##Data, & defaultProtectedGetFn, assetText(name, asset reference.));\ + addProtectedField(assetEnumNameConcat(enumString, File), TypeSoundFilename, Offset(m##name##Name[i], consoleClass), _set##name##Data, & defaultProtectedGetFn, assetText(name, docs), AbstractClassRep::FIELD_HideInInspectors); \ + addProtectedField(assetEnumNameConcat(enumString, Asset), TypeSoundAssetId, Offset(m##name##AssetId[i], consoleClass), _set##name##Data, & defaultProtectedGetFn, assetText(name, asset reference.));\ }\ #pragma region Arrayed Asset Macros