RefinedRD/sf_mod_refinedrdapi
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Raw Pointers to TObjectPtr migration

Browse Source
This commit is contained in:
mrhid6
2026-06-05 21:19:21 +01:00
parent 74badcca9b
commit dbcd107343
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/RefinedRDApi/Public/Subsystems/RRDADataAssetSubsystem.h
+12 -12
View File
@@ -28,7 +28,7 @@ struct FRRDADataHolderTurbineData
GENERATED_BODY()
UPROPERTY(BlueprintReadOnly)
TMap<TSubclassOf<UFGItemDescriptor>, URRDATurbineDataAsset*> Data;
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDATurbineDataAsset>> Data;
};
USTRUCT(BlueprintType)
@@ -37,7 +37,7 @@ struct FRRDADataHolderBoilerData
GENERATED_BODY()
UPROPERTY(BlueprintReadOnly)
TMap<TSubclassOf<UFGItemDescriptor>, URRDABoilerDataAsset*> Data;
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDABoilerDataAsset>> Data;
};
USTRUCT(BlueprintType)
@@ -46,7 +46,7 @@ struct FRRDADataHolderCoolerData
GENERATED_BODY()
UPROPERTY(BlueprintReadOnly)
TMap<TSubclassOf<UFGItemDescriptor>, URRDACoolerDataAsset*> Data;
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDACoolerDataAsset>> Data;
};
USTRUCT(BlueprintType)
@@ -55,7 +55,7 @@ struct FRRDADataHolderHeaterData
GENERATED_BODY()
UPROPERTY(BlueprintReadOnly)
TMap<TSubclassOf<UFGItemDescriptor>, URRDAHeaterDataAsset*> Data;
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDAHeaterDataAsset>> Data;
};
USTRUCT(BlueprintType)
@@ -64,13 +64,13 @@ struct FRRDADataHolderDSBuildingData
GENERATED_BODY()
UPROPERTY()
URRDADataAssetDSAdapterCovers* AdapterCovers;
TObjectPtr<URRDADataAssetDSAdapterCovers> AdapterCovers;
UPROPERTY()
URRDADataAssetDSModAdapter* ModAdapter;
TObjectPtr<URRDADataAssetDSModAdapter> ModAdapter;
UPROPERTY()
TArray<URRDADataAssetDSItemFilter*> ItemFilters;
TArray<TObjectPtr<URRDADataAssetDSItemFilter>> ItemFilters;
};
UCLASS()
@@ -227,13 +227,13 @@ public:
public:
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
TMap<TSubclassOf<UFGItemDescriptor>, URRDADirtDataAsset*> mDirtAssets;
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDADirtDataAsset>> mDirtAssets;
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
TMap<TSubclassOf<AFGBuildableFactory>, FRRDADataHolderDSBuildingData> mDSBuildingData;
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
TMap<int32, URRDAGeneratorDataAsset*> mGeneratorAssets;
TMap<int32, TObjectPtr<URRDAGeneratorDataAsset>> mGeneratorAssets;
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
TMap<int32, FRRDADataHolderTurbineData> mTurbineAssets;
@@ -248,13 +248,13 @@ public:
TMap<ERRDAHeaterType, FRRDADataHolderHeaterData> mHeaterAssets;
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
TArray<URRDADataAssetSolarPower*> mSolarPowerAssets;
TArray<TObjectPtr<URRDADataAssetSolarPower>> mSolarPowerAssets;
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
TSet<URRDADataAssetBase*> mDisabledDataAssets;
TSet<TObjectPtr<URRDADataAssetBase>> mDisabledDataAssets;
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
TSet<URRDADataAssetBase*> mEnabledDataAssets;
TSet<TObjectPtr<URRDADataAssetBase>> mEnabledDataAssets;
};
template <class T>