Updated some methods still using DBPF and not Database

Author: emd4600

Spore ModAPI/SourceCode/App/App.cpp

@@ -14,7 +14,7 @@ namespace App
 		Args(uint32_t instanceID, eastl::string16& dst, uint32_t tableID), Args(instanceID, dst, tableID));
 
 	auto_METHOD(Thumbnail_cImportExport, bool, SavePNG,
-		Args(Resource::ResourceObject* pResource, RenderWare::Raster* pImage, Resource::DBPF* pDBPF,
+		Args(Resource::ResourceObject* pResource, RenderWare::Raster* pImage, Resource::Database* pDBPF,
 			bool forceReplace, bool disableSteganography),
 		Args(pResource, pImage, pDBPF, forceReplace, disableSteganography));
 

Spore ModAPI/Spore/Anim/IAnimManager.h

@@ -2,7 +2,7 @@
 
 #include <Spore\Anim\IAnimWorld.h>
 #include <Spore\Anim\TLSA.h>
-#include <Spore\Resource\DatabasePackedFile.h>
+#include <Spore\Resource\Database.h>
 
 #define AnimManager (*Anim::IAnimManager::Get())
 
@@ -34,10 +34,10 @@ namespace Anim
 		/* 44h */	virtual void LoadRequiredAnimations(uint32_t animID) = 0;  // reads .animation
 		/* 48h */	virtual int func48h() = 0;
 		/* 4Ch */	virtual int func4Ch() = 0;
-		/* 50h */	virtual bool SaveTlsa(Resource::DBPF* pDBPF) = 0;
-		/* 54h */	virtual bool SavePctp(Resource::DBPF* pDBPF) = 0;
-		/* 58h */	virtual bool SaveGait(Resource::DBPF* pDBPF) = 0;
-		/* 58h */	virtual bool SaveAnimation(Resource::DBPF* pDBPF, int) = 0;
+		/* 50h */	virtual bool SaveTlsa(Resource::Database* database) = 0;
+		/* 54h */	virtual bool SavePctp(Resource::Database* database) = 0;
+		/* 58h */	virtual bool SaveGait(Resource::Database* database) = 0;
+		/* 58h */	virtual bool SaveAnimation(Resource::Database* database, int) = 0;
 		/* 5Ch */	virtual int func5Ch(int, int) = 0;
 
 		static IAnimManager* Get();

Spore ModAPI/Spore/App/Thumbnail_cImportExport.h

@@ -3,7 +3,7 @@
 #include <Spore\Internal.h>
 #include <Spore\App\IMessageListener.h>
 #include <Spore\Resource\ResourceObject.h>
-#include <Spore\Resource\DatabasePackedFile.h>
+#include <Spore\Resource\Database.h>
 #include <Spore\RenderWare\Raster.h>
 #include <EASTL\hash_map.h>
 #include <EASTL\string.h>
@@ -44,11 +44,11 @@ namespace App
 		/// 
 		/// @param pResource The resource object to encode inside the PNG. It will be encoded using the appropriate Resource::IResourceFactory
 		/// @param pImage The raster that is written as the image
-		/// @param pDBPF The DBPF taht contains the pollen metadata, and where the PNG will be saved
+		/// @param database The Database taht contains the pollen metadata, and where the PNG will be saved
 		/// @param forceReplace [Optional] If false (by default), if the `.png` already exists in the folder, it will try writing variants like `(1)`, `(2)`,...
 		/// @param disableSteganography [Optional] If false (by default), the data in the `.png` will be stored in a special way meant to save space.
 		/// @returns `true` on success, `false` if something failed.
-		bool SavePNG(Resource::ResourceObject* pResource, RenderWare::Raster* pImage, Resource::DBPF* pDBPF, 
+		bool SavePNG(Resource::ResourceObject* pResource, RenderWare::Raster* pImage, Resource::Database* database, 
 			bool forceReplace = false, bool disableSteganography = false);
 
 		static Thumbnail_cImportExport* Get();

Spore ModAPI/Spore/Resource/IResourceManager.h

@@ -46,8 +46,8 @@ namespace Resource
 	/// for example, `.raster` and `.rw4` are assigned to the same resource type.
 	///
 	/// You can assign your own factories or delete existing ones, but if that is not an option, ResourceManager provides a method to find
-	/// the DatabasePackedFile that contains a certain file. This way, ResourceManager can always be used to get files, either via the GetResource
-	/// method or the GetDBPF one. The DBPFs are stored in the resource manager according to their priority.
+	/// the Database that contains a certain file. This way, ResourceManager can always be used to get files, either via the GetResource
+	/// method or the FindDatabase one. The databases are stored in the resource manager according to their priority.
 	///
 	/// The manager contains a list of ICache instances that is used to avoid repeteadly creating new instances of a resource that
 	/// already exists. The IResourceManager::GetPrivateResource() method can be used instead of IResourceManager::GetResource() to forcibly create a new resource even if it's already
@@ -84,7 +84,7 @@ namespace Resource
 		/// Gets the resource that has the given ResourceKey name. 
 		/// If the resource is contained in the cache, that will be used.
 		/// The name will be modified to use the correct types, according to the mappings in this manager.
-		/// The resource will be seached in all the DBPF files in this manager, unless a specific one is specified.
+		/// The resource will be seached in all the databases in this manager, unless a specific one is specified.
 		/// Once the file is found, the correct factory will be used to generate the appropiate resource, unless
 		/// a specific IResourceFactory is specified.
 		///
@@ -155,10 +155,10 @@ namespace Resource
 			IResourceFactory* pFactory = nullptr,
 			const ResourceKey* pCacheName = nullptr) = 0;
 
-		/// Writes the given resource to a package file. If the DBPF is specified in this method, a new file will
-		/// always be created on it even if it does not exist yet; however, if no DBPF is specified, the resource
-		/// will be written in the first DBPF that contains a file with the given name.
-		/// If there is a problem while writing the resource, the file on the DBPF will be deleted.
+		/// Writes the given resource to a package file. If the database is specified in this method, a new file will
+		/// always be created on it even if it does not exist yet; however, if no database is specified, the resource
+		/// will be written in the first database that contains a file with the given name.
+		/// If there is a problem while writing the resource, the file on the database will be deleted.
 		///
 		/// @param pResource[in] The ResourceObject to write. It will be written according to the IResourceFactory specified or the one that corresponds to the typeID.
 		/// @param pFactoryData[in] [Optional] Additional data that is passed to the resource factory, usually null.
@@ -243,7 +243,7 @@ namespace Resource
 		/* 4Ch */	virtual size_t GetFactoryList(eastl::list<IResourceFactory*>& dst, uint32_t resourceTypeID = ResourceKey::kWildcardID) = 0;
 
 		/// Adds/removes the given DatabasePackedFile to this manager, using the priority specified.
-		/// The priority of a DBPF is used when getting files from the resource manager;
+		/// The priority of a database is used when getting files from the resource manager;
 		/// since a certain file name can be contained in multiple packages, the one with the
 		/// most priority will be chosen.
 		/// The usage of the first argument is unknown, but it is usually 'true'.
@@ -256,7 +256,7 @@ namespace Resource
 		/// Checks if a database is already registered in this manager, and optionally gets its priority.
 		/// @param[in] pDatabase The database
 		/// @param[out] dstPriority [Optional] A pointer to an integer that will contain the priority. This parameter can be nullptr.
-		/// @returns True if the manager contained the DBPF, false otherwise.
+		/// @returns True if the manager contained the database, false otherwise.
 		///
 		/* 54h */	virtual bool IsDatabaseRegistered(Database* pDatabase, int* dstPriority = nullptr) = 0;
 

Spore ModAPI/Spore/Resource/RecordInfo.h

@@ -5,7 +5,7 @@
 namespace Resource
 {
 	///
-	/// A structure that contains the metadata of a file stored in a DBPF, such as the offset in the package file and the size.
+	/// A structure that contains the metadata of a file stored in a database, such as the offset in the package file and the size.
 	///
 	struct RecordInfo
 	{

Spore ModAPI/Spore/Resources.h

@@ -37,5 +37,7 @@
 ///
 /// This namespace contains all the necessary classes needed for working with file resources stored in .package files.
 /// The main class is the IResourceManager, which can be used to get resources from the file system.
-/// The DatabasePackedFile represents a .package file that contains resources.
+/// The resource manager contains a list of Database objects, which can be one of these two:
+///  - The DatabasePackedFile represents a .package file that contains resources.
+///  - The DatabaseDirectoryFiles represents a plain disk folder, such as the `Games/Game0` folder
 ///

Spore ModAPI/Spore/Simulator/SubSystem/StarManager.h

@@ -24,7 +24,7 @@
 #include <Spore\Simulator\SubSystem\cRelationshipManager.h>
 #include <Spore\Simulator\cStarRecord.h>
 #include <Spore\Simulator\cPlanet.h>
-#include <Spore\Resource\DatabasePackedFile.h>
+#include <Spore\Resource\Database.h>
 #include <Spore\Swarm\Components\DistributeEffect.h>
 #include <Spore\App\IMessageListener.h>
 #include <Spore\App\MessageListenerData.h>
@@ -315,9 +315,9 @@ namespace Simulator
 		/* 21Ch */	bool field_21C;  // true
 		/* 220h */	ObjectPtr mpGlobalCLGItems;  //TODO cCollectableItems
 		/// `planetRecords.pkt`
-		/* 224h */	DatabasePackedFilePtr mpPlanetRecordsTempDBPF;
+		/* 224h */	DatabasePtr mpPlanetRecordsTempDatabase;
 		/// `planetRecords.pkp`
-		/* 228h */	DatabasePackedFilePtr mpPlanetRecordsDBPF;
+		/* 228h */	DatabasePtr mpPlanetRecordsDatabase;
 
 	public:
 		/// Returns the active Simulator star manager, used for most things in space stage.

Spore ModAPI/Spore/Terrain/ITerrainResourceManager.h

@@ -21,7 +21,7 @@ namespace Terrain
 
 		/// Creates a property list and saves it to a file with key `outputKey`,
 		/// copying to it the terrain script identified with `groupID!instanceID`.
-		/// This will also rewrite the DBPF that stores the planet property lists.
+		/// This will also rewrite the database that stores the planet property lists.
 		/// @param outputKey
 		/// @param instanceID
 		/// @param groupID