Browse Source

trim assetEnumNameConcat to 2 values, set INITPERSISTFIELD_SOUNDASSET_ENUMED to exclude maxValue

AzaezelX 4 years ago
parent
commit
64a87ceba8
1 changed files with 4 additions and 4 deletions
  1. 4 4
      Engine/source/T3D/assets/SoundAsset.h

+ 4 - 4
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<enumType>(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