Fix custom json asset usage for game settings if loaded before game scripting module is loaded

This commit is contained in:
Wojtek Figat
2022-09-14 21:13:58 +02:00
parent f1adedd689
commit 0e523204d5
3 changed files with 7 additions and 3 deletions

View File

@@ -62,9 +62,10 @@ public:
Guid assetId = Guid::Empty; \
gameSettings->CustomSettings.TryGet(TEXT(name), assetId); \
const auto asset = Content::Load<JsonAsset>(assetId); \
if (asset && asset->Instance && asset->InstanceType == type::TypeInitializer) \
if (asset) \
{ \
result = static_cast<type*>(asset->Instance); \
if (auto* instance = asset->GetInstance<type>()) \
result = instance; \
} \
} \
return result; \