CDClient cleanup and optimization (#1023)

* CDClient cleanup and optimization

- Use static function to get table name
- Remove unused GetName function
- Replace above function with a static GetTableName function
- Remove verbose comments
- Remove verbose initializers
- Remove need to specify table name when getting a table by name
- Remove unused typedef for mac and linux

* Re-add unused table

Convert tables to singletons

- Convert all CDClient tables to singletons
- Move Singleton.h to dCommon
- Reduce header clutter in CDClientManager

dCommon/dEnums/dCommonVars.h

@@ -64,11 +64,6 @@ typedef std::set<LWOOBJID> TSetObjID;
 
 const float PI = 3.14159f;
 
-#if defined(__unix) || defined(__APPLE__)
-//For Linux:
-typedef __int64_t __int64;
-#endif
-
 //============ STRUCTS ==============
 
 struct LWOSCENEID {

dDatabase/CDClientManager.cpp

@@ -1,46 +1,80 @@
 #include "CDClientManager.h"
+#include "CDActivityRewardsTable.h"
+#include "CDAnimationsTable.h"
+#include "CDBehaviorParameterTable.h"
+#include "CDBehaviorTemplateTable.h"
+#include "CDComponentsRegistryTable.h"
+#include "CDCurrencyTableTable.h"
+#include "CDDestructibleComponentTable.h"
+#include "CDEmoteTable.h"
+#include "CDInventoryComponentTable.h"
+#include "CDItemComponentTable.h"
+#include "CDItemSetsTable.h"
+#include "CDItemSetSkillsTable.h"
+#include "CDLevelProgressionLookupTable.h"
+#include "CDLootMatrixTable.h"
+#include "CDLootTableTable.h"
+#include "CDMissionNPCComponentTable.h"
+#include "CDMissionTasksTable.h"
+#include "CDMissionsTable.h"
+#include "CDObjectSkillsTable.h"
+#include "CDObjectsTable.h"
+#include "CDPhysicsComponentTable.h"
+#include "CDRebuildComponentTable.h"
+#include "CDScriptComponentTable.h"
+#include "CDSkillBehaviorTable.h"
+#include "CDZoneTableTable.h"
+#include "CDVendorComponentTable.h"
+#include "CDActivitiesTable.h"
+#include "CDPackageComponentTable.h"
+#include "CDProximityMonitorComponentTable.h"
+#include "CDMovementAIComponentTable.h"
+#include "CDBrickIDTableTable.h"
+#include "CDRarityTableTable.h"
+#include "CDMissionEmailTable.h"
+#include "CDRewardsTable.h"
+#include "CDPropertyEntranceComponentTable.h"
+#include "CDPropertyTemplateTable.h"
+#include "CDFeatureGatingTable.h"
+#include "CDRailActivatorComponent.h"
 
-// Static Variables
+CDClientManager::CDClientManager() {
-CDClientManager* CDClientManager::m_Address = nullptr;
+	CDActivityRewardsTable::Instance();
-
+	UNUSED(CDAnimationsTable::Instance());
-//! Initializes the manager
+	CDBehaviorParameterTable::Instance();
-void CDClientManager::Initialize(void) {
+	CDBehaviorTemplateTable::Instance();
-	tables.insert(std::make_pair("ActivityRewards", new CDActivityRewardsTable()));
+	CDComponentsRegistryTable::Instance();
-	UNUSED(tables.insert(std::make_pair("Animations", new CDAnimationsTable())));
+	CDCurrencyTableTable::Instance();
-	tables.insert(std::make_pair("BehaviorParameter", new CDBehaviorParameterTable()));
+	CDDestructibleComponentTable::Instance();
-	tables.insert(std::make_pair("BehaviorTemplate", new CDBehaviorTemplateTable()));
+	CDEmoteTableTable::Instance();
-	tables.insert(std::make_pair("ComponentsRegistry", new CDComponentsRegistryTable()));
+	CDInventoryComponentTable::Instance();
-	tables.insert(std::make_pair("CurrencyTable", new CDCurrencyTableTable()));
+	CDItemComponentTable::Instance();
-	tables.insert(std::make_pair("DestructibleComponent", new CDDestructibleComponentTable()));
+	CDItemSetsTable::Instance();
-	tables.insert(std::make_pair("EmoteTable", new CDEmoteTableTable()));
+	CDItemSetSkillsTable::Instance();
-	tables.insert(std::make_pair("InventoryComponent", new CDInventoryComponentTable()));
+	CDLevelProgressionLookupTable::Instance();
-	tables.insert(std::make_pair("ItemComponent", new CDItemComponentTable()));
+	CDLootMatrixTable::Instance();
-	tables.insert(std::make_pair("ItemSets", new CDItemSetsTable()));
+	CDLootTableTable::Instance();
-	tables.insert(std::make_pair("ItemSetSkills", new CDItemSetSkillsTable()));
+	CDMissionNPCComponentTable::Instance();
-	tables.insert(std::make_pair("LevelProgressionLookup", new CDLevelProgressionLookupTable()));
+	CDMissionTasksTable::Instance();
-	tables.insert(std::make_pair("LootMatrix", new CDLootMatrixTable()));
+	CDMissionsTable::Instance();
-	tables.insert(std::make_pair("LootTable", new CDLootTableTable()));
+	CDObjectSkillsTable::Instance();
-	tables.insert(std::make_pair("MissionNPCComponent", new CDMissionNPCComponentTable()));
+	CDObjectsTable::Instance();
-	tables.insert(std::make_pair("MissionTasks", new CDMissionTasksTable()));
+	CDPhysicsComponentTable::Instance();
-	tables.insert(std::make_pair("Missions", new CDMissionsTable()));
+	CDRebuildComponentTable::Instance();
-	tables.insert(std::make_pair("ObjectSkills", new CDObjectSkillsTable()));
+	CDScriptComponentTable::Instance();
-	tables.insert(std::make_pair("Objects", new CDObjectsTable()));
+	CDSkillBehaviorTable::Instance();
-	tables.insert(std::make_pair("PhysicsComponent", new CDPhysicsComponentTable()));
+	CDZoneTableTable::Instance();
-	tables.insert(std::make_pair("RebuildComponent", new CDRebuildComponentTable()));
+	CDVendorComponentTable::Instance();
-	tables.insert(std::make_pair("ScriptComponent", new CDScriptComponentTable()));
+	CDActivitiesTable::Instance();
-	tables.insert(std::make_pair("SkillBehavior", new CDSkillBehaviorTable()));
+	CDPackageComponentTable::Instance();
-	tables.insert(std::make_pair("ZoneTable", new CDZoneTableTable()));
+	CDProximityMonitorComponentTable::Instance();
-	tables.insert(std::make_pair("VendorComponent", new CDVendorComponentTable()));
+	CDMovementAIComponentTable::Instance();
-	tables.insert(std::make_pair("Activities", new CDActivitiesTable()));
+	CDBrickIDTableTable::Instance();
-	tables.insert(std::make_pair("PackageComponent", new CDPackageComponentTable()));
+	CDRarityTableTable::Instance();
-	tables.insert(std::make_pair("ProximityMonitorComponent", new CDProximityMonitorComponentTable()));
+	CDMissionEmailTable::Instance();
-	tables.insert(std::make_pair("MovementAIComponent", new CDMovementAIComponentTable()));
+	CDRewardsTable::Instance();
-	tables.insert(std::make_pair("BrickIDTable", new CDBrickIDTableTable()));
+	CDPropertyEntranceComponentTable::Instance();
-	tables.insert(std::make_pair("RarityTable", new CDRarityTableTable()));
+	CDPropertyTemplateTable::Instance();
-	tables.insert(std::make_pair("MissionEmail", new CDMissionEmailTable()));
+	CDFeatureGatingTable::Instance();
-	tables.insert(std::make_pair("Rewards", new CDRewardsTable()));
+	CDRailActivatorComponentTable::Instance();
-	tables.insert(std::make_pair("PropertyEntranceComponent", new CDPropertyEntranceComponentTable()));
-	tables.insert(std::make_pair("PropertyTemplate", new CDPropertyTemplateTable()));
-	tables.insert(std::make_pair("FeatureGating", new CDFeatureGatingTable()));
-	tables.insert(std::make_pair("RailActivatorComponent", new CDRailActivatorComponentTable()));
 }

dDatabase/CDClientManager.h

@@ -1,96 +1,24 @@
 #pragma once
 
-// Custom Classes
 #include "CDTable.h"
 
-// Tables
+#include "Singleton.h"
-#include "CDActivityRewardsTable.h"
-#include "CDAnimationsTable.h"
-#include "CDBehaviorParameterTable.h"
-#include "CDBehaviorTemplateTable.h"
-#include "CDComponentsRegistryTable.h"
-#include "CDCurrencyTableTable.h"
-#include "CDDestructibleComponentTable.h"
-#include "CDEmoteTable.h"
-#include "CDInventoryComponentTable.h"
-#include "CDItemComponentTable.h"
-#include "CDItemSetsTable.h"
-#include "CDItemSetSkillsTable.h"
-#include "CDLevelProgressionLookupTable.h"
-#include "CDLootMatrixTable.h"
-#include "CDLootTableTable.h"
-#include "CDMissionNPCComponentTable.h"
-#include "CDMissionTasksTable.h"
-#include "CDMissionsTable.h"
-#include "CDObjectSkillsTable.h"
-#include "CDObjectsTable.h"
-#include "CDPhysicsComponentTable.h"
-#include "CDRebuildComponentTable.h"
-#include "CDScriptComponentTable.h"
-#include "CDSkillBehaviorTable.h"
-#include "CDZoneTableTable.h"
-#include "CDVendorComponentTable.h"
-#include "CDActivitiesTable.h"
-#include "CDPackageComponentTable.h"
-#include "CDProximityMonitorComponentTable.h"
-#include "CDMovementAIComponentTable.h"
-#include "CDBrickIDTableTable.h"
-#include "CDRarityTableTable.h"
-#include "CDMissionEmailTable.h"
-#include "CDRewardsTable.h"
-#include "CDPropertyEntranceComponentTable.h"
-#include "CDPropertyTemplateTable.h"
-#include "CDFeatureGatingTable.h"
-#include "CDRailActivatorComponent.h"
 
-// C++
+/**
-#include <type_traits>
+ * Initialize the CDClient tables so they are all loaded into memory.
-#include <unordered_map>
-
-/*!
-  \file CDClientManager.hpp
-  \brief A manager for the CDClient tables
  */
-
+class CDClientManager : public Singleton<CDClientManager> {
- //! Manages all data from the CDClient
-class CDClientManager {
-private:
-	static CDClientManager* m_Address;                 //!< The singleton address
-
-	std::unordered_map<std::string, CDTable*> tables;   //!< The tables
-
 public:
+	CDClientManager();
 
-	//! The singleton method
+	/**
-	static CDClientManager* Instance() {
+	 * Fetch a table from CDClient
-		if (m_Address == 0) {
+	 * 
-			m_Address = new CDClientManager;
+	 * @tparam Table type to fetch
-		}
+	 * @return A pointer to the requested table.
-
-		return m_Address;
-	}
-
-	//! Initializes the manager
-	void Initialize(void);
-
-	//! Fetches a CDClient table
-	/*!
-	  This function uses typename T which must be a subclass of CDTable.
-	  It returns the class that conforms to the class name
-
-	  \param tableName The table name
-	  \return The class or nullptr
 	 */
 	template<typename T>
-	T* GetTable(const std::string& tableName) {
+	T* GetTable() {
-		static_assert(std::is_base_of<CDTable, T>::value, "T should inherit from CDTable!");
+		return &T::Instance();
-
-		for (auto itr = this->tables.begin(); itr != this->tables.end(); ++itr) {
-			if (itr->first == tableName) {
-				return dynamic_cast<T*>(itr->second);
-			}
-		}
-
-		return nullptr;
 	}
 };

dDatabase/Tables/CDActivitiesTable.cpp

@@ -1,6 +1,5 @@
 #include "CDActivitiesTable.h"
 
-//! Constructor
 CDActivitiesTable::CDActivitiesTable(void) {
 
 	// First, get the size of the table
@@ -48,15 +47,6 @@ CDActivitiesTable::CDActivitiesTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDActivitiesTable::~CDActivitiesTable(void) {}
-
-//! Returns the table's name
-std::string CDActivitiesTable::GetName(void) const {
-	return "Activities";
-}
-
-//! Queries the table with a custom "where" clause
 std::vector<CDActivities> CDActivitiesTable::Query(std::function<bool(CDActivities)> predicate) {
 
 	std::vector<CDActivities> data = cpplinq::from(this->entries)
@@ -66,7 +56,6 @@ std::vector<CDActivities> CDActivitiesTable::Query(std::function<bool(CDActiviti
 	return data;
 }
 
-//! Gets all the entries in the table
 std::vector<CDActivities> CDActivitiesTable::GetEntries(void) const {
 	return this->entries;
 }

dDatabase/Tables/CDActivitiesTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDActivitiesTable.hpp
- \brief Contains data for the Activities table
- */
-
- //! Activities Entry Struct
 struct CDActivities {
 	unsigned int ActivityID;
 	unsigned int locStatus;
@@ -31,36 +25,14 @@ struct CDActivities {
 	float optionalPercentage;
 };
 
-
+class CDActivitiesTable : public CDTable<CDActivitiesTable> {
-//! Activities table
-class CDActivitiesTable : public CDTable {
 private:
 	std::vector<CDActivities> entries;
 
 public:
-
+	CDActivitiesTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDActivitiesTable(void);
-
-	//! Destructor
-	~CDActivitiesTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDActivities> Query(std::function<bool(CDActivities)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDActivities> GetEntries(void) const;
-
 };

dDatabase/Tables/CDActivityRewardsTable.cpp

@@ -1,6 +1,5 @@
 #include "CDActivityRewardsTable.h"
 
-//! Constructor
 CDActivityRewardsTable::CDActivityRewardsTable(void) {
 
 	// First, get the size of the table
@@ -36,15 +35,6 @@ CDActivityRewardsTable::CDActivityRewardsTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDActivityRewardsTable::~CDActivityRewardsTable(void) {}
-
-//! Returns the table's name
-std::string CDActivityRewardsTable::GetName(void) const {
-	return "ActivityRewards";
-}
-
-//! Queries the table with a custom "where" clause
 std::vector<CDActivityRewards> CDActivityRewardsTable::Query(std::function<bool(CDActivityRewards)> predicate) {
 
 	std::vector<CDActivityRewards> data = cpplinq::from(this->entries)
@@ -54,7 +44,6 @@ std::vector<CDActivityRewards> CDActivityRewardsTable::Query(std::function<bool(
 	return data;
 }
 
-//! Gets all the entries in the table
 std::vector<CDActivityRewards> CDActivityRewardsTable::GetEntries(void) const {
 	return this->entries;
 }

dDatabase/Tables/CDActivityRewardsTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDActivityRewardsTable.hpp
- \brief Contains data for the ActivityRewards table
- */
-
- //! ActivityRewards Entry Struct
 struct CDActivityRewards {
 	unsigned int objectTemplate;        //!< The object template (?)
 	unsigned int ActivityRewardIndex;   //!< The activity reward index
@@ -19,36 +13,15 @@ struct CDActivityRewards {
 	std::string description;            //!< The description
 };
 
-
+class CDActivityRewardsTable : public CDTable<CDActivityRewardsTable> {
-//! ActivityRewards table
-class CDActivityRewardsTable : public CDTable {
 private:
 	std::vector<CDActivityRewards> entries;
 
 public:
-
+	CDActivityRewardsTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDActivityRewardsTable(void);
-
-	//! Destructor
-	~CDActivityRewardsTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDActivityRewards> Query(std::function<bool(CDActivityRewards)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDActivityRewards> GetEntries(void) const;
 
 };

dDatabase/Tables/CDAnimationsTable.cpp

@@ -1,6 +1,5 @@
 #include "CDAnimationsTable.h"
 
-//! Constructor
 CDAnimationsTable::CDAnimationsTable(void) {
 
 	// First, get the size of the table
@@ -42,15 +41,6 @@ CDAnimationsTable::CDAnimationsTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDAnimationsTable::~CDAnimationsTable(void) {}
-
-//! Returns the table's name
-std::string CDAnimationsTable::GetName(void) const {
-	return "Animations";
-}
-
-//! Queries the table with a custom "where" clause
 std::vector<CDAnimations> CDAnimationsTable::Query(std::function<bool(CDAnimations)> predicate) {
 
 	std::vector<CDAnimations> data = cpplinq::from(this->entries)
@@ -60,7 +50,6 @@ std::vector<CDAnimations> CDAnimationsTable::Query(std::function<bool(CDAnimatio
 	return data;
 }
 
-//! Gets all the entries in the table
 std::vector<CDAnimations> CDAnimationsTable::GetEntries(void) const {
 	return this->entries;
 }

dDatabase/Tables/CDAnimationsTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDAnimationsTable.hpp
- \brief Contains data for the Animations table
- */
-
- //! Animations Entry Struct
 struct CDAnimations {
 	unsigned int animationGroupID;          //!< The animation group ID
 	std::string animation_type;        //!< The animation type
@@ -26,35 +20,14 @@ struct CDAnimations {
 };
 
 
-//! Animations table
+class CDAnimationsTable : public CDTable<CDAnimationsTable> {
-class CDAnimationsTable : public CDTable {
 private:
 	std::vector<CDAnimations> entries;
 
 public:
-
+	CDAnimationsTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDAnimationsTable(void);
-
-	//! Destructor
-	~CDAnimationsTable(void);
-
-	//! Returns the table's name
-	/*!
-	 \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	 \param predicate The predicate
-	 */
 	std::vector<CDAnimations> Query(std::function<bool(CDAnimations)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDAnimations> GetEntries(void) const;
-
 };

dDatabase/Tables/CDBehaviorParameterTable.cpp

@@ -1,7 +1,6 @@
 #include "CDBehaviorParameterTable.h"
 #include "GeneralUtils.h"
 
-//! Constructor
 CDBehaviorParameterTable::CDBehaviorParameterTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM BehaviorParameter");
 	uint32_t uniqueParameterId = 0;
@@ -28,14 +27,6 @@ CDBehaviorParameterTable::CDBehaviorParameterTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDBehaviorParameterTable::~CDBehaviorParameterTable(void) {}
-
-//! Returns the table's name
-std::string CDBehaviorParameterTable::GetName(void) const {
-	return "BehaviorParameter";
-}
-
 float CDBehaviorParameterTable::GetValue(const uint32_t behaviorID, const std::string& name, const float defaultValue) {
 	auto parameterID = this->m_ParametersList.find(name);
 	if (parameterID == this->m_ParametersList.end()) return defaultValue;

dDatabase/Tables/CDBehaviorParameterTable.h

@@ -5,37 +5,18 @@
 #include <unordered_map>
 #include <unordered_set>
 
-/*!
- \file CDBehaviorParameterTable.hpp
- \brief Contains data for the BehaviorParameter table
- */
-
- //! BehaviorParameter Entry Struct
 struct CDBehaviorParameter {
 	unsigned int behaviorID;											//!< The Behavior ID
 	std::unordered_map<std::string, uint32_t>::iterator parameterID;   	//!< The Parameter ID
 	float value;            											//!< The value of the behavior template
 };
 
-//! BehaviorParameter table
+class CDBehaviorParameterTable : public CDTable<CDBehaviorParameterTable> {
-class CDBehaviorParameterTable : public CDTable {
 private:
 	std::unordered_map<uint64_t, CDBehaviorParameter> m_Entries;
 	std::unordered_map<std::string, uint32_t> m_ParametersList;
 public:
-
+	CDBehaviorParameterTable();
-	//! Constructor
-	CDBehaviorParameterTable(void);
-
-	//! Destructor
-	~CDBehaviorParameterTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
 	float GetValue(const uint32_t behaviorID, const std::string& name, const float defaultValue = 0);
 
 	std::map<std::string, float> GetParametersByBehaviorID(uint32_t behaviorID);

dDatabase/Tables/CDBehaviorTemplateTable.cpp

@@ -1,6 +1,5 @@
 #include "CDBehaviorTemplateTable.h"
 
-//! Constructor
 CDBehaviorTemplateTable::CDBehaviorTemplateTable(void) {
 
 	// First, get the size of the table
@@ -40,15 +39,6 @@ CDBehaviorTemplateTable::CDBehaviorTemplateTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDBehaviorTemplateTable::~CDBehaviorTemplateTable(void) {}
-
-//! Returns the table's name
-std::string CDBehaviorTemplateTable::GetName(void) const {
-	return "BehaviorTemplate";
-}
-
-//! Queries the table with a custom "where" clause
 std::vector<CDBehaviorTemplate> CDBehaviorTemplateTable::Query(std::function<bool(CDBehaviorTemplate)> predicate) {
 
 	std::vector<CDBehaviorTemplate> data = cpplinq::from(this->entries)
@@ -58,7 +48,6 @@ std::vector<CDBehaviorTemplate> CDBehaviorTemplateTable::Query(std::function<boo
 	return data;
 }
 
-//! Gets all the entries in the table
 std::vector<CDBehaviorTemplate> CDBehaviorTemplateTable::GetEntries(void) const {
 	return this->entries;
 }

dDatabase/Tables/CDBehaviorTemplateTable.h

@@ -5,12 +5,6 @@
 #include <unordered_map>
 #include <unordered_set>
 
-/*!
- \file CDBehaviorTemplateTable.hpp
- \brief Contains data for the BehaviorTemplate table
- */
-
- //! BehaviorTemplate Entry Struct
 struct CDBehaviorTemplate {
 	unsigned int behaviorID;                                         //!< The Behavior ID
 	unsigned int templateID;                                         //!< The Template ID (LOT)
@@ -19,36 +13,16 @@ struct CDBehaviorTemplate {
 };
 
 
-//! BehaviorTemplate table
+class CDBehaviorTemplateTable : public CDTable<CDBehaviorTemplateTable> {
-class CDBehaviorTemplateTable : public CDTable {
 private:
 	std::vector<CDBehaviorTemplate> entries;
 	std::unordered_map<uint32_t, CDBehaviorTemplate> entriesMappedByBehaviorID;
 	std::unordered_set<std::string> m_EffectHandles;
 public:
-
+	CDBehaviorTemplateTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDBehaviorTemplateTable(void);
-
-	//! Destructor
-	~CDBehaviorTemplateTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDBehaviorTemplate> Query(std::function<bool(CDBehaviorTemplate)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	   \return The entries
-	 */
 	std::vector<CDBehaviorTemplate> GetEntries(void) const;
 
 	const CDBehaviorTemplate GetByBehaviorID(uint32_t behaviorID);

dDatabase/Tables/CDBrickIDTableTable.cpp

@@ -1,6 +1,5 @@
 #include "CDBrickIDTableTable.h"
 
-//! Constructor
 CDBrickIDTableTable::CDBrickIDTableTable(void) {
 
 	// First, get the size of the table
@@ -31,15 +30,6 @@ CDBrickIDTableTable::CDBrickIDTableTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDBrickIDTableTable::~CDBrickIDTableTable(void) {}
-
-//! Returns the table's name
-std::string CDBrickIDTableTable::GetName(void) const {
-	return "BrickIDTable";
-}
-
-//! Queries the table with a custom "where" clause
 std::vector<CDBrickIDTable> CDBrickIDTableTable::Query(std::function<bool(CDBrickIDTable)> predicate) {
 
 	std::vector<CDBrickIDTable> data = cpplinq::from(this->entries)
@@ -49,7 +39,6 @@ std::vector<CDBrickIDTable> CDBrickIDTableTable::Query(std::function<bool(CDBric
 	return data;
 }
 
-//! Gets all the entries in the table
 std::vector<CDBrickIDTable> CDBrickIDTableTable::GetEntries(void) const {
 	return this->entries;
 }

dDatabase/Tables/CDBrickIDTableTable.h

@@ -16,34 +16,14 @@ struct CDBrickIDTable {
 
 
 //! BrickIDTable table
-class CDBrickIDTableTable : public CDTable {
+class CDBrickIDTableTable : public CDTable<CDBrickIDTableTable> {
 private:
 	std::vector<CDBrickIDTable> entries;
 
 public:
-
+	CDBrickIDTableTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDBrickIDTableTable(void);
-
-	//! Destructor
-	~CDBrickIDTableTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDBrickIDTable> Query(std::function<bool(CDBrickIDTable)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	   \return The entries
-	 */
 	std::vector<CDBrickIDTable> GetEntries(void) const;
-
 };

dDatabase/Tables/CDComponentsRegistryTable.cpp

@@ -3,7 +3,6 @@
 
 #define CDCLIENT_CACHE_ALL
 
-//! Constructor
 CDComponentsRegistryTable::CDComponentsRegistryTable(void) {
 
 #ifdef CDCLIENT_CACHE_ALL
@@ -31,24 +30,6 @@ CDComponentsRegistryTable::CDComponentsRegistryTable(void) {
 
 		this->mappedEntries.insert_or_assign(((uint64_t)entry.component_type) << 32 | ((uint64_t)entry.id), entry.component_id);
 
-		//this->entries.push_back(entry);
-
-		/*
-		//Darwin's stuff:
-		const auto& it = this->mappedEntries.find(entry.id);
-		if (it != mappedEntries.end()) {
-			const auto& iter = it->second.find(entry.component_type);
-			if (iter == it->second.end()) {
-				it->second.insert(std::make_pair(entry.component_type, entry.component_id));
-			}
-		}
-		else {
-			std::map<unsigned int, unsigned int> map;
-			map.insert(std::make_pair(entry.component_type, entry.component_id));
-			this->mappedEntries.insert(std::make_pair(entry.id, map));
-		}
-		*/
-
 		tableData.nextRow();
 	}
 
@@ -56,14 +37,6 @@ CDComponentsRegistryTable::CDComponentsRegistryTable(void) {
 #endif
 }
 
-//! Destructor
-CDComponentsRegistryTable::~CDComponentsRegistryTable(void) {}
-
-//! Returns the table's name
-std::string CDComponentsRegistryTable::GetName(void) const {
-	return "ComponentsRegistry";
-}
-
 int32_t CDComponentsRegistryTable::GetByIDAndType(uint32_t id, eReplicaComponentType componentType, int32_t defaultValue) {
 	const auto& iter = this->mappedEntries.find(((uint64_t)componentType) << 32 | ((uint64_t)id));
 
@@ -73,16 +46,6 @@ int32_t CDComponentsRegistryTable::GetByIDAndType(uint32_t id, eReplicaComponent
 
 	return iter->second;
 
-	/*
-	const auto& it = this->mappedEntries.find(id);
-	if (it != mappedEntries.end()) {
-		const auto& iter = it->second.find(componentType);
-		if (iter != it->second.end()) {
-			return iter->second;
-		}
-	}
-	*/
-
 #ifndef CDCLIENT_CACHE_ALL
 	// Now get the data
 	std::stringstream query;

dDatabase/Tables/CDComponentsRegistryTable.h

@@ -3,12 +3,7 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
-  \file CDComponentsRegistryTable.hpp
-  \brief Contains data for the ComponentsRegistry table
- */
 enum class eReplicaComponentType : uint32_t;
- //! ComponentsRegistry Entry Struct
 struct CDComponentsRegistry {
 	unsigned int id;                    //!< The LOT is used as the ID
 	eReplicaComponentType component_type;        //!< See ComponentTypes enum for values
@@ -16,25 +11,11 @@ struct CDComponentsRegistry {
 };
 
 
-//! ComponentsRegistry table
+class CDComponentsRegistryTable : public CDTable<CDComponentsRegistryTable> {
-class CDComponentsRegistryTable : public CDTable {
 private:
-	//std::vector<CDComponentsRegistry> entries;
 	std::map<uint64_t, uint32_t> mappedEntries; //id, component_type, component_id
 
 public:
-
+	CDComponentsRegistryTable();
-	//! Constructor
-	CDComponentsRegistryTable(void);
-
-	//! Destructor
-	~CDComponentsRegistryTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
 	int32_t GetByIDAndType(uint32_t id, eReplicaComponentType componentType, int32_t defaultValue = 0);
 };

dDatabase/Tables/CDCurrencyTableTable.cpp

@@ -34,15 +34,6 @@ CDCurrencyTableTable::CDCurrencyTableTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDCurrencyTableTable::~CDCurrencyTableTable(void) {}
-
-//! Returns the table's name
-std::string CDCurrencyTableTable::GetName(void) const {
-	return "CurrencyTable";
-}
-
-//! Queries the table with a custom "where" clause
 std::vector<CDCurrencyTable> CDCurrencyTableTable::Query(std::function<bool(CDCurrencyTable)> predicate) {
 
 	std::vector<CDCurrencyTable> data = cpplinq::from(this->entries)
@@ -52,7 +43,6 @@ std::vector<CDCurrencyTable> CDCurrencyTableTable::Query(std::function<bool(CDCu
 	return data;
 }
 
-//! Gets all the entries in the table
 std::vector<CDCurrencyTable> CDCurrencyTableTable::GetEntries(void) const {
 	return this->entries;
 }

dDatabase/Tables/CDCurrencyTableTable.h

@@ -18,34 +18,14 @@ struct CDCurrencyTable {
 };
 
 //! CurrencyTable table
-class CDCurrencyTableTable : public CDTable {
+class CDCurrencyTableTable : public CDTable<CDCurrencyTableTable> {
 private:
 	std::vector<CDCurrencyTable> entries;
 
 public:
-
+	CDCurrencyTableTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDCurrencyTableTable(void);
-
-	//! Destructor
-	~CDCurrencyTableTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDCurrencyTable> Query(std::function<bool(CDCurrencyTable)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDCurrencyTable> GetEntries(void) const;
-
 };

dDatabase/Tables/CDDestructibleComponentTable.cpp

@@ -43,15 +43,6 @@ CDDestructibleComponentTable::CDDestructibleComponentTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDDestructibleComponentTable::~CDDestructibleComponentTable(void) {}
-
-//! Returns the table's name
-std::string CDDestructibleComponentTable::GetName(void) const {
-	return "DestructibleComponent";
-}
-
-//! Queries the table with a custom "where" clause
 std::vector<CDDestructibleComponent> CDDestructibleComponentTable::Query(std::function<bool(CDDestructibleComponent)> predicate) {
 
 	std::vector<CDDestructibleComponent> data = cpplinq::from(this->entries)
@@ -61,7 +52,6 @@ std::vector<CDDestructibleComponent> CDDestructibleComponentTable::Query(std::fu
 	return data;
 }
 
-//! Gets all the entries in the table
 std::vector<CDDestructibleComponent> CDDestructibleComponentTable::GetEntries(void) const {
 	return this->entries;
 }

dDatabase/Tables/CDDestructibleComponentTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDDestructibleComponentTable.hpp
- \brief Contains data for the DestructibleComponent table
- */
-
- //! ItemComponent Struct
 struct CDDestructibleComponent {
 	unsigned int id;                            //!< The component ID from the ComponentsRegistry Table
 	int faction;                       //!< The Faction ID of the object
@@ -26,35 +20,14 @@ struct CDDestructibleComponent {
 	int difficultyLevel;               //!< ???
 };
 
-//! ItemComponent table
+class CDDestructibleComponentTable : public CDTable<CDDestructibleComponentTable> {
-class CDDestructibleComponentTable : public CDTable {
 private:
 	std::vector<CDDestructibleComponent> entries;
 
 public:
-
+	CDDestructibleComponentTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDDestructibleComponentTable(void);
-
-	//! Destructor
-	~CDDestructibleComponentTable(void);
-
-	//! Returns the table's name
-	/*!
-	 \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	 \param predicate The predicate
-	 */
 	std::vector<CDDestructibleComponent> Query(std::function<bool(CDDestructibleComponent)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDDestructibleComponent> GetEntries(void) const;
-
 };

dDatabase/Tables/CDEmoteTable.cpp

@@ -30,11 +30,6 @@ CDEmoteTableTable::~CDEmoteTableTable(void) {
 	entries.clear();
 }
 
-//! Returns the table's name
-std::string CDEmoteTableTable::GetName(void) const {
-	return "Emotes";
-}
-
 CDEmoteTable* CDEmoteTableTable::GetEmote(int id) {
 	for (auto e : entries) {
 		if (e.first == id) return e.second;

dDatabase/Tables/CDEmoteTable.h

@@ -4,12 +4,6 @@
 #include "CDTable.h"
 #include <map>
 
-/*!
- \file CDEmoteTable.hpp
- \brief Contains data for the CDEmoteTable table
- */
-
- //! CDEmoteEntry Struct
 struct CDEmoteTable {
 	CDEmoteTable() {
 		ID = -1;
@@ -32,25 +26,13 @@ struct CDEmoteTable {
 	std::string gateVersion;
 };
 
-//! CDEmoteTable table
+class CDEmoteTableTable : public CDTable<CDEmoteTableTable> {
-class CDEmoteTableTable : public CDTable {
 private:
 	std::map<int, CDEmoteTable*> entries;
 
 public:
-
+	CDEmoteTableTable();
-	//! Constructor
+	~CDEmoteTableTable();
-	CDEmoteTableTable(void);
+	// Returns an emote by ID
-
-	//! Destructor
-	~CDEmoteTableTable(void);
-
-	//! Returns the table's name
-	/*!
-	 \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Returns an emote by ID
 	CDEmoteTable* GetEmote(int id);
 };

dDatabase/Tables/CDFeatureGatingTable.cpp

@@ -34,15 +34,6 @@ CDFeatureGatingTable::CDFeatureGatingTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDFeatureGatingTable::~CDFeatureGatingTable(void) {}
-
-//! Returns the table's name
-std::string CDFeatureGatingTable::GetName(void) const {
-	return "FeatureGating";
-}
-
-//! Queries the table with a custom "where" clause
 std::vector<CDFeatureGating> CDFeatureGatingTable::Query(std::function<bool(CDFeatureGating)> predicate) {
 
 	std::vector<CDFeatureGating> data = cpplinq::from(this->entries)
@@ -62,7 +53,6 @@ bool CDFeatureGatingTable::FeatureUnlocked(const std::string& feature) const {
 	return false;
 }
 
-//! Gets all the entries in the table
 std::vector<CDFeatureGating> CDFeatureGatingTable::GetEntries(void) const {
 	return this->entries;
 }

dDatabase/Tables/CDFeatureGatingTable.h

@@ -3,11 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDFeatureGatingTable.hpp
- */
-
- //! ItemComponent Struct
 struct CDFeatureGating {
 	std::string featureName;
 	int32_t major;
@@ -16,37 +11,16 @@ struct CDFeatureGating {
 	std::string description;
 };
 
-//! ItemComponent table
+class CDFeatureGatingTable : public CDTable<CDFeatureGatingTable> {
-class CDFeatureGatingTable : public CDTable {
 private:
 	std::vector<CDFeatureGating> entries;
 
 public:
-
+	CDFeatureGatingTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDFeatureGatingTable(void);
-
-	//! Destructor
-	~CDFeatureGatingTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDFeatureGating> Query(std::function<bool(CDFeatureGating)> predicate);
 
 	bool FeatureUnlocked(const std::string& feature) const;
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDFeatureGating> GetEntries(void) const;
-
 };

dDatabase/Tables/CDInventoryComponentTable.cpp

@@ -33,15 +33,6 @@ CDInventoryComponentTable::CDInventoryComponentTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDInventoryComponentTable::~CDInventoryComponentTable(void) {}
-
-//! Returns the table's name
-std::string CDInventoryComponentTable::GetName(void) const {
-	return "InventoryComponent";
-}
-
-//! Queries the table with a custom "where" clause
 std::vector<CDInventoryComponent> CDInventoryComponentTable::Query(std::function<bool(CDInventoryComponent)> predicate) {
 
 	std::vector<CDInventoryComponent> data = cpplinq::from(this->entries)
@@ -51,7 +42,6 @@ std::vector<CDInventoryComponent> CDInventoryComponentTable::Query(std::function
 	return data;
 }
 
-//! Gets all the entries in the table
 std::vector<CDInventoryComponent> CDInventoryComponentTable::GetEntries(void) const {
 	return this->entries;
 }

dDatabase/Tables/CDInventoryComponentTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDInventoryComponentTable.hpp
- \brief Contains data for the InventoryComponent table
- */
-
- //! ItemComponent Struct
 struct CDInventoryComponent {
 	unsigned int id;                //!< The component ID for this object
 	unsigned int itemid;            //!< The LOT of the object
@@ -16,35 +10,14 @@ struct CDInventoryComponent {
 	bool equip;             //!< Whether or not to equip the item
 };
 
-//! ItemComponent table
+class CDInventoryComponentTable : public CDTable<CDInventoryComponentTable> {
-class CDInventoryComponentTable : public CDTable {
 private:
 	std::vector<CDInventoryComponent> entries;
 
 public:
-
+	CDInventoryComponentTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDInventoryComponentTable(void);
-
-	//! Destructor
-	~CDInventoryComponentTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDInventoryComponent> Query(std::function<bool(CDInventoryComponent)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDInventoryComponent> GetEntries(void) const;
-
 };

dDatabase/Tables/CDItemComponentTable.cpp

@@ -74,14 +74,6 @@ CDItemComponentTable::CDItemComponentTable(void) {
 #endif
 }
 
-//! Destructor
-CDItemComponentTable::~CDItemComponentTable(void) {}
-
-//! Returns the table's name
-std::string CDItemComponentTable::GetName(void) const {
-	return "ItemComponent";
-}
-
 const CDItemComponent& CDItemComponentTable::GetItemComponentByID(unsigned int skillID) {
 	const auto& it = this->entries.find(skillID);
 	if (it != this->entries.end()) {

dDatabase/Tables/CDItemComponentTable.h

@@ -4,12 +4,6 @@
 #include "CDTable.h"
 #include "dCommonVars.h"
 
-/*!
-  \file CDItemComponentTable.hpp
-  \brief Contains data for the ItemComponent table
- */
-
- //! ItemComponent Struct
 struct CDItemComponent {
 	unsigned int id;                        //!< The Component ID
 	std::string equipLocation;         //!< The equip location
@@ -55,28 +49,15 @@ struct CDItemComponent {
 	float SellMultiplier;           //!< Something to do with early vendors perhaps (but replaced)
 };
 
-//! ItemComponent table
+class CDItemComponentTable : public CDTable<CDItemComponentTable> {
-class CDItemComponentTable : public CDTable {
 private:
 	std::map<unsigned int, CDItemComponent> entries;
 
 public:
-
+	CDItemComponentTable();
-	//! Constructor
-	CDItemComponentTable(void);
-
-	//! Destructor
-	~CDItemComponentTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
 	static std::map<LOT, uint32_t> ParseCraftingCurrencies(const CDItemComponent& itemComponent);
 
-	//! Gets an entry by ID
+	// Gets an entry by ID
 	const CDItemComponent& GetItemComponentByID(unsigned int skillID);
 
 	static CDItemComponent Default;

dDatabase/Tables/CDItemSetSkillsTable.cpp

@@ -32,15 +32,6 @@ CDItemSetSkillsTable::CDItemSetSkillsTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDItemSetSkillsTable::~CDItemSetSkillsTable(void) {}
-
-//! Returns the table's name
-std::string CDItemSetSkillsTable::GetName(void) const {
-	return "ItemSetSkills";
-}
-
-//! Queries the table with a custom "where" clause
 std::vector<CDItemSetSkills> CDItemSetSkillsTable::Query(std::function<bool(CDItemSetSkills)> predicate) {
 
 	std::vector<CDItemSetSkills> data = cpplinq::from(this->entries)
@@ -50,7 +41,6 @@ std::vector<CDItemSetSkills> CDItemSetSkillsTable::Query(std::function<bool(CDIt
 	return data;
 }
 
-//! Gets all the entries in the table
 std::vector<CDItemSetSkills> CDItemSetSkillsTable::GetEntries(void) const {
 	return this->entries;
 }
@@ -65,4 +55,3 @@ std::vector<CDItemSetSkills> CDItemSetSkillsTable::GetBySkillID(unsigned int Ski
 
 	return toReturn;
 }
-

dDatabase/Tables/CDItemSetSkillsTable.h

@@ -3,50 +3,22 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDItemSetSkillsTable.hpp
- \brief Contains data for the ItemSetSkills table
- */
-
- //! ZoneTable Struct
 struct CDItemSetSkills {
 	unsigned int SkillSetID;            //!< The skill set ID
 	unsigned int SkillID;               //!< The skill ID
 	unsigned int SkillCastType;         //!< The skill cast type
 };
 
-//! ItemSets table
+class CDItemSetSkillsTable : public CDTable<CDItemSetSkillsTable> {
-class CDItemSetSkillsTable : public CDTable {
 private:
 	std::vector<CDItemSetSkills> entries;
 
 public:
-
+	CDItemSetSkillsTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDItemSetSkillsTable(void);
-
-	//! Destructor
-	~CDItemSetSkillsTable(void);
-
-	//! Returns the table's name
-	/*!
-	 \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	 \param predicate The predicate
-	 */
 	std::vector<CDItemSetSkills> Query(std::function<bool(CDItemSetSkills)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDItemSetSkills> GetEntries(void) const;
 
 	std::vector<CDItemSetSkills> GetBySkillID(unsigned int SkillSetID);
-
 };
-

dDatabase/Tables/CDItemSetsTable.cpp

@@ -44,15 +44,6 @@ CDItemSetsTable::CDItemSetsTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDItemSetsTable::~CDItemSetsTable(void) {}
-
-//! Returns the table's name
-std::string CDItemSetsTable::GetName(void) const {
-	return "ItemSets";
-}
-
-//! Queries the table with a custom "where" clause
 std::vector<CDItemSets> CDItemSetsTable::Query(std::function<bool(CDItemSets)> predicate) {
 
 	std::vector<CDItemSets> data = cpplinq::from(this->entries)
@@ -62,7 +53,6 @@ std::vector<CDItemSets> CDItemSetsTable::Query(std::function<bool(CDItemSets)> p
 	return data;
 }
 
-//! Gets all the entries in the table
 std::vector<CDItemSets> CDItemSetsTable::GetEntries(void) const {
 	return this->entries;
 }

dDatabase/Tables/CDItemSetsTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDItemSetsTable.hpp
- \brief Contains data for the ItemSets table
- */
-
- //! ZoneTable Struct
 struct CDItemSets {
 	unsigned int setID;             //!< The item set ID
 	unsigned int locStatus;         //!< The loc status
@@ -27,36 +21,15 @@ struct CDItemSets {
 	float priority;         //!< The priority
 };
 
-//! ItemSets table
+class CDItemSetsTable : public CDTable<CDItemSetsTable> {
-class CDItemSetsTable : public CDTable {
 private:
 	std::vector<CDItemSets> entries;
 
 public:
-
+	CDItemSetsTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDItemSetsTable(void);
-
-	//! Destructor
-	~CDItemSetsTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDItemSets> Query(std::function<bool(CDItemSets)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDItemSets> GetEntries(void) const;
-
 };
 

dDatabase/Tables/CDLevelProgressionLookupTable.cpp

@@ -32,14 +32,6 @@ CDLevelProgressionLookupTable::CDLevelProgressionLookupTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDLevelProgressionLookupTable::~CDLevelProgressionLookupTable(void) {}
-
-//! Returns the table's name
-std::string CDLevelProgressionLookupTable::GetName(void) const {
-	return "LevelProgressionLookup";
-}
-
 //! Queries the table with a custom "where" clause
 std::vector<CDLevelProgressionLookup> CDLevelProgressionLookupTable::Query(std::function<bool(CDLevelProgressionLookup)> predicate) {
 

dDatabase/Tables/CDLevelProgressionLookupTable.h

@@ -3,47 +3,21 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDLevelProgressionLookupTable.hpp
- \brief Contains data for the LevelProgressionLookup table
- */
-
- //! LevelProgressionLookup Entry Struct
 struct CDLevelProgressionLookup {
 	unsigned int id;                    //!< The Level ID
 	unsigned int requiredUScore;        //!< The required LEGO Score
 	std::string BehaviorEffect;    //!< The behavior effect attached to this
 };
 
-//! LevelProgressionLookup table
+class CDLevelProgressionLookupTable : public CDTable<CDLevelProgressionLookupTable> {
-class CDLevelProgressionLookupTable : public CDTable {
 private:
 	std::vector<CDLevelProgressionLookup> entries;
 
 public:
-
+	CDLevelProgressionLookupTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDLevelProgressionLookupTable(void);
-
-	//! Destructor
-	~CDLevelProgressionLookupTable(void);
-
-	//! Returns the table's name
-	/*!
-	 \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	 \param predicate The predicate
-	 */
 	std::vector<CDLevelProgressionLookup> Query(std::function<bool(CDLevelProgressionLookup)> predicate);
 
-	//! Gets all the entries in the table
+	// Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDLevelProgressionLookup> GetEntries(void) const;
-
 };

dDatabase/Tables/CDLootMatrixTable.cpp

@@ -38,15 +38,6 @@ CDLootMatrixTable::CDLootMatrixTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDLootMatrixTable::~CDLootMatrixTable(void) {}
-
-//! Returns the table's name
-std::string CDLootMatrixTable::GetName(void) const {
-	return "LootMatrix";
-}
-
-//! Queries the table with a custom "where" clause
 std::vector<CDLootMatrix> CDLootMatrixTable::Query(std::function<bool(CDLootMatrix)> predicate) {
 
 	std::vector<CDLootMatrix> data = cpplinq::from(this->entries)
@@ -56,7 +47,6 @@ std::vector<CDLootMatrix> CDLootMatrixTable::Query(std::function<bool(CDLootMatr
 	return data;
 }
 
-//! Gets all the entries in the table
 const std::vector<CDLootMatrix>& CDLootMatrixTable::GetEntries(void) const {
 	return this->entries;
 }

dDatabase/Tables/CDLootMatrixTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDLootMatrixTable.hpp
- \brief Contains data for the ObjectSkills table
- */
-
- //! LootMatrix Struct
 struct CDLootMatrix {
 	unsigned int LootMatrixIndex;           //!< The Loot Matrix Index
 	unsigned int LootTableIndex;            //!< The Loot Table Index
@@ -21,36 +15,15 @@ struct CDLootMatrix {
 	UNUSED(std::string gate_version);          //!< The Gate Version
 };
 
-//! MissionNPCComponent table
+class CDLootMatrixTable : public CDTable<CDLootMatrixTable> {
-class CDLootMatrixTable : public CDTable {
 private:
 	std::vector<CDLootMatrix> entries;
 
 public:
-
+	CDLootMatrixTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDLootMatrixTable(void);
-
-	//! Destructor
-	~CDLootMatrixTable(void);
-
-	//! Returns the table's name
-	/*!
-	 \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	 \param predicate The predicate
-	 */
 	std::vector<CDLootMatrix> Query(std::function<bool(CDLootMatrix)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	const std::vector<CDLootMatrix>& GetEntries(void) const;
-
 };
 

dDatabase/Tables/CDLootTableTable.cpp

@@ -35,14 +35,6 @@ CDLootTableTable::CDLootTableTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDLootTableTable::~CDLootTableTable(void) {}
-
-//! Returns the table's name
-std::string CDLootTableTable::GetName(void) const {
-	return "LootTable";
-}
-
 //! Queries the table with a custom "where" clause
 std::vector<CDLootTable> CDLootTableTable::Query(std::function<bool(CDLootTable)> predicate) {
 

dDatabase/Tables/CDLootTableTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDLootTableTable.hpp
- \brief Contains data for the LootTable table
- */
-
- //! LootTable Struct
 struct CDLootTable {
 	unsigned int itemid;                 //!< The LOT of the item
 	unsigned int LootTableIndex;         //!< The Loot Table Index
@@ -17,36 +11,15 @@ struct CDLootTable {
 	unsigned int sortPriority;           //!< The sorting priority
 };
 
-//! LootTable table
+class CDLootTableTable : public CDTable<CDLootTableTable> {
-class CDLootTableTable : public CDTable {
 private:
 	std::vector<CDLootTable> entries;
 
 public:
-
+	CDLootTableTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDLootTableTable(void);
-
-	//! Destructor
-	~CDLootTableTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDLootTable> Query(std::function<bool(CDLootTable)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	const std::vector<CDLootTable>& GetEntries(void) const;
-
 };
 

dDatabase/Tables/CDMissionEmailTable.cpp

@@ -37,14 +37,6 @@ CDMissionEmailTable::CDMissionEmailTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDMissionEmailTable::~CDMissionEmailTable(void) {}
-
-//! Returns the table's name
-std::string CDMissionEmailTable::GetName(void) const {
-	return "MissionEmail";
-}
-
 //! Queries the table with a custom "where" clause
 std::vector<CDMissionEmail> CDMissionEmailTable::Query(std::function<bool(CDMissionEmail)> predicate) {
 

dDatabase/Tables/CDMissionEmailTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDMissionEmailTable.hpp
- \brief Contains data for the MissionEmail table
- */
-
- //! MissionEmail Entry Struct
 struct CDMissionEmail {
 	unsigned int ID;
 	unsigned int messageType;
@@ -21,35 +15,14 @@ struct CDMissionEmail {
 };
 
 
-//! MissionEmail table
+class CDMissionEmailTable : public CDTable<CDMissionEmailTable> {
-class CDMissionEmailTable : public CDTable {
 private:
 	std::vector<CDMissionEmail> entries;
 
 public:
-
+	CDMissionEmailTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDMissionEmailTable(void);
-
-	//! Destructor
-	~CDMissionEmailTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDMissionEmail> Query(std::function<bool(CDMissionEmail)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDMissionEmail> GetEntries(void) const;
-
 };

dDatabase/Tables/CDMissionNPCComponentTable.cpp

@@ -34,14 +34,6 @@ CDMissionNPCComponentTable::CDMissionNPCComponentTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDMissionNPCComponentTable::~CDMissionNPCComponentTable(void) {}
-
-//! Returns the table's name
-std::string CDMissionNPCComponentTable::GetName(void) const {
-	return "MissionNPCComponent";
-}
-
 //! Queries the table with a custom "where" clause
 std::vector<CDMissionNPCComponent> CDMissionNPCComponentTable::Query(std::function<bool(CDMissionNPCComponent)> predicate) {
 

dDatabase/Tables/CDMissionNPCComponentTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDMissionNPCComponentTable.hpp
- \brief Contains data for the ObjectSkills table
- */
-
- //! MissionNPCComponent Struct
 struct CDMissionNPCComponent {
 	unsigned int id;                //!< The ID
 	unsigned int missionID;         //!< The Mission ID
@@ -17,35 +11,16 @@ struct CDMissionNPCComponent {
 	std::string gate_version;  //!< The gate version
 };
 
-//! MissionNPCComponent table
+class CDMissionNPCComponentTable : public CDTable<CDMissionNPCComponentTable> {
-class CDMissionNPCComponentTable : public CDTable {
 private:
 	std::vector<CDMissionNPCComponent> entries;
 
 public:
-
+	CDMissionNPCComponentTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDMissionNPCComponentTable(void);
-
-	//! Destructor
-	~CDMissionNPCComponentTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDMissionNPCComponent> Query(std::function<bool(CDMissionNPCComponent)> predicate);
 
-	//! Gets all the entries in the table
+	// Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDMissionNPCComponent> GetEntries(void) const;
 
 };

dDatabase/Tables/CDMissionTasksTable.cpp

@@ -42,15 +42,6 @@ CDMissionTasksTable::CDMissionTasksTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDMissionTasksTable::~CDMissionTasksTable(void) {}
-
-//! Returns the table's name
-std::string CDMissionTasksTable::GetName(void) const {
-	return "MissionTasks";
-}
-
-//! Queries the table with a custom "where" clause
 std::vector<CDMissionTasks> CDMissionTasksTable::Query(std::function<bool(CDMissionTasks)> predicate) {
 
 	std::vector<CDMissionTasks> data = cpplinq::from(this->entries)
@@ -74,7 +65,6 @@ std::vector<CDMissionTasks*> CDMissionTasksTable::GetByMissionID(uint32_t missio
 	return tasks;
 }
 
-//! Gets all the entries in the table
 const std::vector<CDMissionTasks>& CDMissionTasksTable::GetEntries(void) const {
 	return this->entries;
 }

dDatabase/Tables/CDMissionTasksTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDMissionTasksTable.hpp
- \brief Contains data for the MissionTasks table
- */
-
- //! ObjectSkills Struct
 struct CDMissionTasks {
 	unsigned int id;                //!< The Mission ID that the task belongs to
 	UNUSED(unsigned int locStatus);         //!< ???
@@ -25,37 +19,17 @@ struct CDMissionTasks {
 	UNUSED(std::string gate_version);  //!< ???
 };
 
-//! ObjectSkills table
+class CDMissionTasksTable : public CDTable<CDMissionTasksTable> {
-class CDMissionTasksTable : public CDTable {
 private:
 	std::vector<CDMissionTasks> entries;
 
 public:
-
+	CDMissionTasksTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDMissionTasksTable(void);
-
-	//! Destructor
-	~CDMissionTasksTable(void);
-
-	//! Returns the table's name
-	/*!
-	 \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	 \param predicate The predicate
-	 */
 	std::vector<CDMissionTasks> Query(std::function<bool(CDMissionTasks)> predicate);
 
 	std::vector<CDMissionTasks*> GetByMissionID(uint32_t missionID);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	const std::vector<CDMissionTasks>& GetEntries(void) const;
 };
 

dDatabase/Tables/CDMissionsTable.cpp

@@ -85,15 +85,6 @@ CDMissionsTable::CDMissionsTable(void) {
 	Default.id = -1;
 }
 
-//! Destructor
-CDMissionsTable::~CDMissionsTable(void) {}
-
-//! Returns the table's name
-std::string CDMissionsTable::GetName(void) const {
-	return "Missions";
-}
-
-//! Queries the table with a custom "where" clause
 std::vector<CDMissions> CDMissionsTable::Query(std::function<bool(CDMissions)> predicate) {
 
 	std::vector<CDMissions> data = cpplinq::from(this->entries)
@@ -103,7 +94,6 @@ std::vector<CDMissions> CDMissionsTable::Query(std::function<bool(CDMissions)> p
 	return data;
 }
 
-//! Gets all the entries in the table
 const std::vector<CDMissions>& CDMissionsTable::GetEntries(void) const {
 	return this->entries;
 }

dDatabase/Tables/CDMissionsTable.h

@@ -5,12 +5,6 @@
 #include <map>
 #include <cstdint>
 
-/*!
- \file CDMissionsTable.hpp
- \brief Contains data for the Missions table
- */
-
- //! Missions Struct
 struct CDMissions {
 	int id;                        //!< The Mission ID
 	std::string defined_type;          //!< The type of mission
@@ -66,35 +60,16 @@ struct CDMissions {
 	int reward_bankinventory;      //!< The amount of bank space this mission rewards
 };
 
-//! Missions table
+class CDMissionsTable : public CDTable<CDMissionsTable> {
-class CDMissionsTable : public CDTable {
 private:
 	std::vector<CDMissions> entries;
 
 public:
-
+	CDMissionsTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDMissionsTable(void);
-
-	//! Destructor
-	~CDMissionsTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDMissions> Query(std::function<bool(CDMissions)> predicate);
 
-	//! Gets all the entries in the table
+	// Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	const std::vector<CDMissions>& GetEntries(void) const;
 
 	const CDMissions* GetPtrByMissionID(uint32_t missionID) const;

dDatabase/Tables/CDMovementAIComponentTable.cpp

@@ -37,14 +37,6 @@ CDMovementAIComponentTable::CDMovementAIComponentTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDMovementAIComponentTable::~CDMovementAIComponentTable(void) {}
-
-//! Returns the table's name
-std::string CDMovementAIComponentTable::GetName(void) const {
-	return "MovementAIComponent";
-}
-
 //! Queries the table with a custom "where" clause
 std::vector<CDMovementAIComponent> CDMovementAIComponentTable::Query(std::function<bool(CDMovementAIComponent)> predicate) {
 

dDatabase/Tables/CDMovementAIComponentTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDMovementAIComponentTable.hpp
- \brief Contains data for the MovementAIComponent table
- */
-
- //! MovementAIComponent Struct
 struct CDMovementAIComponent {
 	unsigned int id;
 	std::string MovementType;
@@ -20,36 +14,15 @@ struct CDMovementAIComponent {
 	std::string attachedPath;
 };
 
-//! MovementAIComponent table
+class CDMovementAIComponentTable : public CDTable<CDMovementAIComponentTable> {
-class CDMovementAIComponentTable : public CDTable {
 private:
 	std::vector<CDMovementAIComponent> entries;
 
 public:
-
+	CDMovementAIComponentTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDMovementAIComponentTable(void);
-
-	//! Destructor
-	~CDMovementAIComponentTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDMovementAIComponent> Query(std::function<bool(CDMovementAIComponent)> predicate);
 
-	//! Gets all the entries in the table
+	// Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDMovementAIComponent> GetEntries(void) const;
-
 };
-

dDatabase/Tables/CDObjectSkillsTable.cpp

@@ -33,14 +33,6 @@ CDObjectSkillsTable::CDObjectSkillsTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDObjectSkillsTable::~CDObjectSkillsTable(void) {}
-
-//! Returns the table's name
-std::string CDObjectSkillsTable::GetName(void) const {
-	return "ObjectSkills";
-}
-
 //! Queries the table with a custom "where" clause
 std::vector<CDObjectSkills> CDObjectSkillsTable::Query(std::function<bool(CDObjectSkills)> predicate) {
 
@@ -55,4 +47,3 @@ std::vector<CDObjectSkills> CDObjectSkillsTable::Query(std::function<bool(CDObje
 std::vector<CDObjectSkills> CDObjectSkillsTable::GetEntries(void) const {
 	return this->entries;
 }
-

dDatabase/Tables/CDObjectSkillsTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDObjectSkillsTable.hpp
- \brief Contains data for the ObjectSkills table
- */
-
- //! ObjectSkills Struct
 struct CDObjectSkills {
 	unsigned int objectTemplate;        //!< The LOT of the item
 	unsigned int skillID;               //!< The Skill ID of the object
@@ -16,35 +10,16 @@ struct CDObjectSkills {
 	unsigned int AICombatWeight;        //!< ???
 };
 
-//! ObjectSkills table
+class CDObjectSkillsTable : public CDTable<CDObjectSkillsTable> {
-class CDObjectSkillsTable : public CDTable {
 private:
 	std::vector<CDObjectSkills> entries;
 
 public:
-
+	CDObjectSkillsTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDObjectSkillsTable(void);
-
-	//! Destructor
-	~CDObjectSkillsTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDObjectSkills> Query(std::function<bool(CDObjectSkills)> predicate);
 
-	//! Gets all the entries in the table
+	// Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDObjectSkills> GetEntries(void) const;
 
 };

dDatabase/Tables/CDObjectsTable.cpp

@@ -43,14 +43,6 @@ CDObjectsTable::CDObjectsTable(void) {
 	m_default.id = 0;
 }
 
-//! Destructor
-CDObjectsTable::~CDObjectsTable(void) {}
-
-//! Returns the table's name
-std::string CDObjectsTable::GetName(void) const {
-	return "Objects";
-}
-
 const CDObjects& CDObjectsTable::GetByID(unsigned int LOT) {
 	const auto& it = this->entries.find(LOT);
 	if (it != this->entries.end()) {

dDatabase/Tables/CDObjectsTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDObjectsTable.hpp
- \brief Contains data for the Objects table
- */
-
- //! RebuildComponent Struct
 struct CDObjects {
 	unsigned int id;                            //!< The LOT of the object
 	std::string name;                      //!< The internal name of the object
@@ -26,29 +20,14 @@ struct CDObjects {
 	UNUSED(unsigned int HQ_valid);                      //!< Probably used for the Nexus HQ database on LEGOUniverse.com
 };
 
-//! ObjectSkills table
+class CDObjectsTable : public CDTable<CDObjectsTable> {
-class CDObjectsTable : public CDTable {
 private:
-	//std::vector<CDObjects> entries;
 	std::map<unsigned int, CDObjects> entries;
 	CDObjects m_default;
 
 public:
-
+	CDObjectsTable();
-	//! Constructor
+	// Gets an entry by ID
-	CDObjectsTable(void);
-
-	//! Destructor
-	~CDObjectsTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Gets an entry by ID
 	const CDObjects& GetByID(unsigned int LOT);
-
 };
 

dDatabase/Tables/CDPackageComponentTable.cpp

@@ -32,14 +32,6 @@ CDPackageComponentTable::CDPackageComponentTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDPackageComponentTable::~CDPackageComponentTable(void) {}
-
-//! Returns the table's name
-std::string CDPackageComponentTable::GetName(void) const {
-	return "PackageComponent";
-}
-
 //! Queries the table with a custom "where" clause
 std::vector<CDPackageComponent> CDPackageComponentTable::Query(std::function<bool(CDPackageComponent)> predicate) {
 

dDatabase/Tables/CDPackageComponentTable.h

@@ -3,48 +3,20 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDPackageComponentTable.hpp
- \brief Contains data for the PackageComponent table
- */
-
- //! PackageComponent Entry Struct
 struct CDPackageComponent {
 	unsigned int id;
 	unsigned int LootMatrixIndex;
 	unsigned int packageType;
 };
 
-
+class CDPackageComponentTable : public CDTable<CDPackageComponentTable> {
-//! PackageComponent table
-class CDPackageComponentTable : public CDTable {
 private:
 	std::vector<CDPackageComponent> entries;
 
 public:
-
-	//! Constructor
 	CDPackageComponentTable(void);
-
+	// Queries the table with a custom "where" clause
-	//! Destructor
-	~CDPackageComponentTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDPackageComponent> Query(std::function<bool(CDPackageComponent)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDPackageComponent> GetEntries(void) const;
-
 };

dDatabase/Tables/CDPhysicsComponentTable.cpp

@@ -28,7 +28,7 @@ CDPhysicsComponentTable::CDPhysicsComponentTable(void) {
 	tableData.finalize();
 }
 
-CDPhysicsComponentTable::~CDPhysicsComponentTable(void) {
+CDPhysicsComponentTable::~CDPhysicsComponentTable() {
 	for (auto e : m_entries) {
 		if (e.second) delete e.second;
 	}
@@ -36,10 +36,6 @@ CDPhysicsComponentTable::~CDPhysicsComponentTable(void) {
 	m_entries.clear();
 }
 
-std::string CDPhysicsComponentTable::GetName(void) const {
-	return "PhysicsComponent";
-}
-
 CDPhysicsComponent* CDPhysicsComponentTable::GetByID(unsigned int componentID) {
 	for (auto e : m_entries) {
 		if (e.first == componentID) return e.second;

dDatabase/Tables/CDPhysicsComponentTable.h

@@ -21,12 +21,12 @@ struct CDPhysicsComponent {
 	UNUSED(std::string gravityVolumeAsset);
 };
 
-class CDPhysicsComponentTable : public CDTable {
+class CDPhysicsComponentTable : public CDTable<CDPhysicsComponentTable> {
 public:
-	CDPhysicsComponentTable(void);
+	CDPhysicsComponentTable();
-	~CDPhysicsComponentTable(void);
+	~CDPhysicsComponentTable();
 
-	std::string GetName(void) const override;
+	static const std::string GetTableName() { return "PhysicsComponent"; };
 	CDPhysicsComponent* GetByID(unsigned int componentID);
 
 private:

dDatabase/Tables/CDPropertyEntranceComponentTable.cpp

@@ -32,12 +32,6 @@ CDPropertyEntranceComponentTable::CDPropertyEntranceComponentTable() {
 	tableData.finalize();
 }
 
-CDPropertyEntranceComponentTable::~CDPropertyEntranceComponentTable(void) = default;
-
-std::string CDPropertyEntranceComponentTable::GetName() const {
-	return "PropertyEntranceComponent";
-}
-
 CDPropertyEntranceComponent CDPropertyEntranceComponentTable::GetByID(uint32_t id) {
 	for (const auto& entry : entries) {
 		if (entry.id == id)

dDatabase/Tables/CDPropertyEntranceComponentTable.h

@@ -9,31 +9,13 @@ struct CDPropertyEntranceComponent {
 	std::string groupType;
 };
 
-class CDPropertyEntranceComponentTable : public CDTable {
+class CDPropertyEntranceComponentTable : public CDTable<CDPropertyEntranceComponentTable> {
 public:
-	//! Constructor
 	CDPropertyEntranceComponentTable();
-
+	// Queries the table with a custom "where" clause
-	//! Destructor
-	~CDPropertyEntranceComponentTable();
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	[[nodiscard]] std::string GetName() const override;
-
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	CDPropertyEntranceComponent GetByID(uint32_t id);
 
-	//! Gets all the entries in the table
+	// Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	[[nodiscard]] std::vector<CDPropertyEntranceComponent> GetEntries() const { return entries; }
 private:
 	std::vector<CDPropertyEntranceComponent> entries{};

dDatabase/Tables/CDPropertyTemplateTable.cpp

@@ -30,12 +30,6 @@ CDPropertyTemplateTable::CDPropertyTemplateTable() {
 	tableData.finalize();
 }
 
-CDPropertyTemplateTable::~CDPropertyTemplateTable() = default;
-
-std::string CDPropertyTemplateTable::GetName() const {
-	return "PropertyTemplate";
-}
-
 CDPropertyTemplate CDPropertyTemplateTable::GetByMapID(uint32_t mapID) {
 	for (const auto& entry : entries) {
 		if (entry.mapID == mapID)

dDatabase/Tables/CDPropertyTemplateTable.h

@@ -8,12 +8,11 @@ struct CDPropertyTemplate {
 	std::string spawnName;
 };
 
-class CDPropertyTemplateTable : public CDTable {
+class CDPropertyTemplateTable : public CDTable<CDPropertyTemplateTable> {
 public:
 	CDPropertyTemplateTable();
-	~CDPropertyTemplateTable();
 
-	[[nodiscard]] std::string GetName() const override;
+	static const std::string GetTableName() { return "PropertyTemplate"; };
 	CDPropertyTemplate GetByMapID(uint32_t mapID);
 private:
 	std::vector<CDPropertyTemplate> entries{};

dDatabase/Tables/CDProximityMonitorComponentTable.cpp

@@ -33,14 +33,6 @@ CDProximityMonitorComponentTable::CDProximityMonitorComponentTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDProximityMonitorComponentTable::~CDProximityMonitorComponentTable(void) {}
-
-//! Returns the table's name
-std::string CDProximityMonitorComponentTable::GetName(void) const {
-	return "ProximityMonitorComponent";
-}
-
 //! Queries the table with a custom "where" clause
 std::vector<CDProximityMonitorComponent> CDProximityMonitorComponentTable::Query(std::function<bool(CDProximityMonitorComponent)> predicate) {
 

dDatabase/Tables/CDProximityMonitorComponentTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDProximityMonitorComponentTable.hpp
- \brief Contains data for the ProximityMonitorComponent table
- */
-
- //! ProximityMonitorComponent Entry Struct
 struct CDProximityMonitorComponent {
 	unsigned int id;
 	std::string Proximities;
@@ -16,36 +10,14 @@ struct CDProximityMonitorComponent {
 	bool LoadOnServer;
 };
 
-
+class CDProximityMonitorComponentTable : public CDTable<CDProximityMonitorComponentTable> {
-//! ProximityMonitorComponent table
-class CDProximityMonitorComponentTable : public CDTable {
 private:
 	std::vector<CDProximityMonitorComponent> entries;
 
 public:
-
-	//! Constructor
 	CDProximityMonitorComponentTable(void);
-
-	//! Destructor
-	~CDProximityMonitorComponentTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
 	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDProximityMonitorComponent> Query(std::function<bool(CDProximityMonitorComponent)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDProximityMonitorComponent> GetEntries(void) const;
-
 };

dDatabase/Tables/CDRailActivatorComponent.cpp

@@ -43,12 +43,6 @@ CDRailActivatorComponentTable::CDRailActivatorComponentTable() {
 	tableData.finalize();
 }
 
-CDRailActivatorComponentTable::~CDRailActivatorComponentTable() = default;
-
-std::string CDRailActivatorComponentTable::GetName() const {
-	return "RailActivatorComponent";
-}
-
 CDRailActivatorComponent CDRailActivatorComponentTable::GetEntryByID(int32_t id) const {
 	for (const auto& entry : m_Entries) {
 		if (entry.id == id)

dDatabase/Tables/CDRailActivatorComponent.h

@@ -20,12 +20,10 @@ struct CDRailActivatorComponent {
 	bool showNameBillboard;
 };
 
-class CDRailActivatorComponentTable : public CDTable {
+class CDRailActivatorComponentTable : public CDTable<CDRailActivatorComponentTable> {
 public:
 	CDRailActivatorComponentTable();
-	~CDRailActivatorComponentTable();
+	static const std::string GetTableName() { return "RailActivatorComponent"; };
-
-	std::string GetName() const override;
 	[[nodiscard]] CDRailActivatorComponent GetEntryByID(int32_t id) const;
 	[[nodiscard]] std::vector<CDRailActivatorComponent> GetEntries() const;
 private:

dDatabase/Tables/CDRarityTableTable.cpp

@@ -33,14 +33,6 @@ CDRarityTableTable::CDRarityTableTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDRarityTableTable::~CDRarityTableTable(void) {}
-
-//! Returns the table's name
-std::string CDRarityTableTable::GetName(void) const {
-	return "RarityTable";
-}
-
 //! Queries the table with a custom "where" clause
 std::vector<CDRarityTable> CDRarityTableTable::Query(std::function<bool(CDRarityTable)> predicate) {
 

dDatabase/Tables/CDRarityTableTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDRarityTableTable.hpp
- \brief Contains data for the RarityTable table
- */
-
- //! RarityTable Entry Struct
 struct CDRarityTable {
 	unsigned int id;
 	float randmax;
@@ -32,37 +26,15 @@ struct CDRarityTable {
 	}
 };
 
-
+class CDRarityTableTable : public CDTable<CDRarityTableTable> {
-//! RarityTable table
-class CDRarityTableTable : public CDTable {
 private:
 	std::vector<CDRarityTable> entries;
 
 public:
-
+	CDRarityTableTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDRarityTableTable(void);
-
-	//! Destructor
-	~CDRarityTableTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDRarityTable> Query(std::function<bool(CDRarityTable)> predicate);
 
-	//! Gets all the entries in the table
+	const std::vector<CDRarityTable>& GetEntries() const;
-	/*!
-	  \return The entries
-	 */
-	const std::vector<CDRarityTable>& GetEntries(void) const;
-
 };
 

dDatabase/Tables/CDRebuildComponentTable.cpp

@@ -39,14 +39,6 @@ CDRebuildComponentTable::CDRebuildComponentTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDRebuildComponentTable::~CDRebuildComponentTable(void) {}
-
-//! Returns the table's name
-std::string CDRebuildComponentTable::GetName(void) const {
-	return "RebuildComponent";
-}
-
 //! Queries the table with a custom "where" clause
 std::vector<CDRebuildComponent> CDRebuildComponentTable::Query(std::function<bool(CDRebuildComponent)> predicate) {
 

dDatabase/Tables/CDRebuildComponentTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDRebuildComponentTable.hpp
- \brief Contains data for the RebuildComponent table
- */
-
- //! RebuildComponent Struct
 struct CDRebuildComponent {
 	unsigned int id;                        //!< The component Id
 	float reset_time;               //!< The reset time
@@ -22,36 +16,15 @@ struct CDRebuildComponent {
 	float time_before_smash;        //!< The time before smash
 };
 
-//! ObjectSkills table
+class CDRebuildComponentTable : public CDTable<CDRebuildComponentTable> {
-class CDRebuildComponentTable : public CDTable {
 private:
 	std::vector<CDRebuildComponent> entries;
 
 public:
-
+	CDRebuildComponentTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDRebuildComponentTable(void);
-
-	//! Destructor
-	~CDRebuildComponentTable(void);
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	  \param predicate The predicate
-	 */
 	std::vector<CDRebuildComponent> Query(std::function<bool(CDRebuildComponent)> predicate);
 
-	//! Gets all the entries in the table
+	std::vector<CDRebuildComponent> GetEntries() const;
-	/*!
-	  \return The entries
-	 */
-	std::vector<CDRebuildComponent> GetEntries(void) const;
-
 };
 

dDatabase/Tables/CDRewardsTable.cpp

@@ -26,10 +26,6 @@ CDRewardsTable::~CDRewardsTable(void) {
 	m_entries.clear();
 }
 
-std::string CDRewardsTable::GetName(void) const {
-	return "Rewards";
-}
-
 std::vector<CDRewards*> CDRewardsTable::GetByLevelID(uint32_t levelID) {
 	std::vector<CDRewards*> result{};
 	for (const auto& e : m_entries) {

dDatabase/Tables/CDRewardsTable.h

@@ -11,12 +11,12 @@ struct CDRewards {
 	int32_t count;
 };
 
-class CDRewardsTable : public CDTable {
+class CDRewardsTable : public CDTable<CDRewardsTable> {
 public:
-	CDRewardsTable(void);
+	CDRewardsTable();
-	~CDRewardsTable(void);
+	~CDRewardsTable();
 
-	std::string GetName(void) const override;
+	static const std::string GetTableName() { return "Rewards"; };
 	std::vector<CDRewards*> GetByLevelID(uint32_t levelID);
 
 private:

dDatabase/Tables/CDScriptComponentTable.cpp

@@ -29,14 +29,6 @@ CDScriptComponentTable::CDScriptComponentTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDScriptComponentTable::~CDScriptComponentTable(void) {}
-
-//! Returns the table's name
-std::string CDScriptComponentTable::GetName(void) const {
-	return "ScriptComponent";
-}
-
 const CDScriptComponent& CDScriptComponentTable::GetByID(unsigned int id) {
 	std::map<unsigned int, CDScriptComponent>::iterator it = this->entries.find(id);
 	if (it != this->entries.end()) {

dDatabase/Tables/CDScriptComponentTable.h

@@ -3,44 +3,20 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDScriptComponentTable.hpp
- \brief Contains data for the ScriptComponent table
- */
-
- //! ScriptComponent Struct
 struct CDScriptComponent {
 	unsigned int id;                        //!< The component ID
 	std::string script_name;           //!< The script name
 	std::string client_script_name;    //!< The client script name
 };
 
-//! ObjectSkills table
+class CDScriptComponentTable : public CDTable<CDScriptComponentTable> {
-class CDScriptComponentTable : public CDTable {
 private:
 	std::map<unsigned int, CDScriptComponent> entries;
 	CDScriptComponent m_ToReturnWhenNoneFound;
 
 public:
-	//! Gets an entry by ID
+	CDScriptComponentTable();
+	// Gets an entry by scriptID
 	const CDScriptComponent& GetByID(unsigned int id);
-
-	//! Constructor
-	CDScriptComponentTable(void);
-
-	//! Destructor
-	~CDScriptComponentTable(void);
-
-	//! Returns the table's name
-	/*!
-	 \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	 \param predicate The predicate
-	 */
-
 };
 

dDatabase/Tables/CDSkillBehaviorTable.cpp

@@ -51,24 +51,8 @@ CDSkillBehaviorTable::CDSkillBehaviorTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDSkillBehaviorTable::~CDSkillBehaviorTable(void) {}
-
-//! Returns the table's name
-std::string CDSkillBehaviorTable::GetName(void) const {
-	return "SkillBehavior";
-}
-
 //! Queries the table with a custom "where" clause
 std::vector<CDSkillBehavior> CDSkillBehaviorTable::Query(std::function<bool(CDSkillBehavior)> predicate) {
-
-	/*std::vector<CDSkillBehavior> data = cpplinq::from(this->entries)
-	>> cpplinq::where(predicate)
-	>> cpplinq::to_vector();
-
-	return data;*/
-
-	//Logger::LogDebug("CDSkillBehaviorTable", "The 'Query' function is no longer working! Please use GetSkillByID instead!");
 	std::vector<CDSkillBehavior> data; //So MSVC shuts up
 	return data;
 }

dDatabase/Tables/CDSkillBehaviorTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDSkillBehaviorTable.hpp
- \brief Contains data for the SkillBehavior table
- */
-
- //! ZoneTable Struct
 struct CDSkillBehavior {
 	unsigned int skillID;               //!< The Skill ID of the skill
 	UNUSED(unsigned int locStatus);             //!< ??
@@ -31,33 +25,17 @@ struct CDSkillBehavior {
 	UNUSED(unsigned int cancelType);            //!< The cancel type (?)
 };
 
-//! SkillBehavior table
+class CDSkillBehaviorTable : public CDTable<CDSkillBehaviorTable> {
-class CDSkillBehaviorTable : public CDTable {
 private:
 	std::map<unsigned int, CDSkillBehavior> entries;
 	CDSkillBehavior m_empty;
 
 public:
-
+	CDSkillBehaviorTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDSkillBehaviorTable(void);
-
-	//! Destructor
-	~CDSkillBehaviorTable(void);
-
-	//! Returns the table's name
-	/*!
-	 \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	 \param predicate The predicate
-	 */
 	std::vector<CDSkillBehavior> Query(std::function<bool(CDSkillBehavior)> predicate);
 
-	//! Gets an entry by ID
+	// Gets an entry by skillID
 	const CDSkillBehavior& GetSkillByID(unsigned int skillID);
 };
 

dDatabase/Tables/CDTable.h

@@ -1,9 +1,8 @@
 #pragma once
 
-// Custom Classes
+#include "CDClientDatabase.h"
-#include "../CDClientDatabase.h"
+#include "Singleton.h"
 
-// C++
 #include <functional>
 #include <string>
 #include <vector>
@@ -19,23 +18,8 @@
 #pragma warning (disable : 4244) //Disable double to float conversion warnings
 #pragma warning (disable : 4715) //Disable "not all control paths return a value"
 
-#if defined(__unix) || defined(__APPLE__)
+template<class Table>
-//For Linux:
+class CDTable : public Singleton<Table> {
-typedef __int64_t __int64;
+protected:
-#endif
+	virtual ~CDTable() = default;
-
-/*!
-  \file CDTable.hpp
-  \brief A virtual class for CDClient Tables
- */
-
- //! The base class for all CD tables
-class CDTable {
-public:
-
-	//! Returns the table's name
-	/*!
-	  \return The table name
-	 */
-	virtual std::string GetName() const = 0;
 };

dDatabase/Tables/CDVendorComponentTable.cpp

@@ -34,14 +34,6 @@ CDVendorComponentTable::CDVendorComponentTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDVendorComponentTable::~CDVendorComponentTable(void) {}
-
-//! Returns the table's name
-std::string CDVendorComponentTable::GetName(void) const {
-	return "VendorComponent";
-}
-
 //! Queries the table with a custom "where" clause
 std::vector<CDVendorComponent> CDVendorComponentTable::Query(std::function<bool(CDVendorComponent)> predicate) {
 

dDatabase/Tables/CDVendorComponentTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDVendorComponentTable.hpp
- \brief Contains data for the VendorComponent table
- */
-
- //! VendorComponent Struct
 struct CDVendorComponent {
 	unsigned int id;           //!< The Component ID
 	float buyScalar;            //!< Buy Scalar (what does that mean?)
@@ -17,36 +11,15 @@ struct CDVendorComponent {
 	unsigned int LootMatrixIndex; //!< LootMatrixIndex of the vendor's items
 };
 
-//! VendorComponent table
+class CDVendorComponentTable : public CDTable<CDVendorComponentTable> {
-class CDVendorComponentTable : public CDTable {
 private:
 	std::vector<CDVendorComponent> entries;
 
 public:
-
+	CDVendorComponentTable();
-	//! Constructor
+	// Queries the table with a custom "where" clause
-	CDVendorComponentTable(void);
-
-	//! Destructor
-	~CDVendorComponentTable(void);
-
-	//! Returns the table's name
-	/*!
-	 \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a custom "where" clause
-	/*!
-	 \param predicate The predicate
-	 */
 	std::vector<CDVendorComponent> Query(std::function<bool(CDVendorComponent)> predicate);
 
-	//! Gets all the entries in the table
-	/*!
-	  \return The entries
-	 */
 	std::vector<CDVendorComponent> GetEntries(void) const;
-
 };
 

dDatabase/Tables/CDZoneTableTable.cpp

@@ -53,14 +53,6 @@ CDZoneTableTable::CDZoneTableTable(void) {
 	tableData.finalize();
 }
 
-//! Destructor
-CDZoneTableTable::~CDZoneTableTable(void) {}
-
-//! Returns the table's name
-std::string CDZoneTableTable::GetName(void) const {
-	return "ZoneTable";
-}
-
 //! Queries the table with a zoneID to find.
 const CDZoneTable* CDZoneTableTable::Query(unsigned int zoneID) {
 	const auto& iter = m_Entries.find(zoneID);

dDatabase/Tables/CDZoneTableTable.h

@@ -3,12 +3,6 @@
 // Custom Classes
 #include "CDTable.h"
 
-/*!
- \file CDZoneTableTable.hpp
- \brief Contains data for the ZoneTable table
- */
-
- //! ZoneTable Struct
 struct CDZoneTable {
 	unsigned int zoneID;                        //!< The Zone ID of the object
 	unsigned int locStatus;                     //!< The Locale Status(?)
@@ -39,28 +33,13 @@ struct CDZoneTable {
 	UNUSED(bool mountsAllowed);                 //!< Whether or not mounts are allowed
 };
 
-//! ZoneTable table
+class CDZoneTableTable : public CDTable<CDZoneTableTable> {
-class CDZoneTableTable : public CDTable {
 private:
 	std::map<unsigned int, CDZoneTable> m_Entries;
 
 public:
+	CDZoneTableTable();
 
-	//! Constructor
+	// Queries the table with a zoneID to find.
-	CDZoneTableTable(void);
-
-	//! Destructor
-	~CDZoneTableTable(void);
-
-	//! Returns the table's name
-	/*!
-	 \return The table name
-	 */
-	std::string GetName(void) const override;
-
-	//! Queries the table with a zoneID to find.
-	/*!
-	 \param id The zoneID
-	 */
 	const CDZoneTable* Query(unsigned int zoneID);
 };

dGame/Entity.cpp

@@ -72,6 +72,18 @@
 #include "TriggerComponent.h"
 #include "eReplicaComponentType.h"
 
+// Table includes
+#include "CDComponentsRegistryTable.h"
+#include "CDCurrencyTableTable.h"
+#include "CDMovementAIComponentTable.h"
+#include "CDProximityMonitorComponentTable.h"
+#include "CDRebuildComponentTable.h"
+#include "CDObjectSkillsTable.h"
+#include "CDObjectsTable.h"
+#include "CDScriptComponentTable.h"
+#include "CDSkillBehaviorTable.h"
+#include "CDZoneTableTable.h"
+
 Entity::Entity(const LWOOBJID& objectID, EntityInfo info, Entity* parentEntity) {
 	m_ObjectID = objectID;
 	m_TemplateID = info.lot;
@@ -158,7 +170,7 @@ void Entity::Initialize() {
 	}
 
 	// Get the registry table
-	CDComponentsRegistryTable* compRegistryTable = CDClientManager::Instance()->GetTable<CDComponentsRegistryTable>("ComponentsRegistry");
+	CDComponentsRegistryTable* compRegistryTable = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
 
 	/**
 	 * Special case for BBB models. They have components not corresponding to the registry.
@@ -330,7 +342,7 @@ void Entity::Initialize() {
 	if (rebuildComponentID > 0) componentID = rebuildComponentID;
 	if (buffComponentID > 0) componentID = buffComponentID;
 
-	CDDestructibleComponentTable* destCompTable = CDClientManager::Instance()->GetTable<CDDestructibleComponentTable>("DestructibleComponent");
+	CDDestructibleComponentTable* destCompTable = CDClientManager::Instance().GetTable<CDDestructibleComponentTable>();
 	std::vector<CDDestructibleComponent> destCompData = destCompTable->Query([=](CDDestructibleComponent entry) { return (entry.id == componentID); });
 
 	if (buffComponentID > 0 || collectibleComponentID > 0) {
@@ -362,7 +374,7 @@ void Entity::Initialize() {
 					uint32_t npcMinLevel = destCompData[0].level;
 					uint32_t currencyIndex = destCompData[0].CurrencyIndex;
 
-					CDCurrencyTableTable* currencyTable = CDClientManager::Instance()->GetTable<CDCurrencyTableTable>("CurrencyTable");
+					CDCurrencyTableTable* currencyTable = CDClientManager::Instance().GetTable<CDCurrencyTableTable>();
 					std::vector<CDCurrencyTable> currencyValues = currencyTable->Query([=](CDCurrencyTable entry) { return (entry.currencyIndex == currencyIndex && entry.npcminlevel == npcMinLevel); });
 
 					if (currencyValues.size() > 0) {
@@ -440,7 +452,7 @@ void Entity::Initialize() {
 	 * This is a bit of a mess
 	 */
 
-	CDScriptComponentTable* scriptCompTable = CDClientManager::Instance()->GetTable<CDScriptComponentTable>("ScriptComponent");
+	CDScriptComponentTable* scriptCompTable = CDClientManager::Instance().GetTable<CDScriptComponentTable>();
 	int32_t scriptComponentID = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::SCRIPT, -1);
 
 	std::string scriptName = "";
@@ -489,7 +501,7 @@ void Entity::Initialize() {
 
 	// ZoneControl script
 	if (m_TemplateID == 2365) {
-		CDZoneTableTable* zoneTable = CDClientManager::Instance()->GetTable<CDZoneTableTable>("ZoneTable");
+		CDZoneTableTable* zoneTable = CDClientManager::Instance().GetTable<CDZoneTableTable>();
 		const auto zoneID = dZoneManager::Instance()->GetZoneID();
 		const CDZoneTable* zoneData = zoneTable->Query(zoneID.GetMapID());
 
@@ -517,7 +529,7 @@ void Entity::Initialize() {
 		RebuildComponent* comp = new RebuildComponent(this);
 		m_Components.insert(std::make_pair(eReplicaComponentType::QUICK_BUILD, comp));
 
-		CDRebuildComponentTable* rebCompTable = CDClientManager::Instance()->GetTable<CDRebuildComponentTable>("RebuildComponent");
+		CDRebuildComponentTable* rebCompTable = CDClientManager::Instance().GetTable<CDRebuildComponentTable>();
 		std::vector<CDRebuildComponent> rebCompData = rebCompTable->Query([=](CDRebuildComponent entry) { return (entry.id == rebuildComponentID); });
 
 		if (rebCompData.size() > 0) {
@@ -637,7 +649,7 @@ void Entity::Initialize() {
 
 	int movementAIID = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::MOVEMENT_AI);
 	if (movementAIID > 0) {
-		CDMovementAIComponentTable* moveAITable = CDClientManager::Instance()->GetTable<CDMovementAIComponentTable>("MovementAIComponent");
+		CDMovementAIComponentTable* moveAITable = CDClientManager::Instance().GetTable<CDMovementAIComponentTable>();
 		std::vector<CDMovementAIComponent> moveAIComp = moveAITable->Query([=](CDMovementAIComponent entry) {return (entry.id == movementAIID); });
 
 		if (moveAIComp.size() > 0) {
@@ -696,7 +708,7 @@ void Entity::Initialize() {
 
 	int proximityMonitorID = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::PROXIMITY_MONITOR);
 	if (proximityMonitorID > 0) {
-		CDProximityMonitorComponentTable* proxCompTable = CDClientManager::Instance()->GetTable<CDProximityMonitorComponentTable>("ProximityMonitorComponent");
+		CDProximityMonitorComponentTable* proxCompTable = CDClientManager::Instance().GetTable<CDProximityMonitorComponentTable>();
 		std::vector<CDProximityMonitorComponent> proxCompData = proxCompTable->Query([=](CDProximityMonitorComponent entry) { return (entry.id == proximityMonitorID); });
 		if (proxCompData.size() > 0) {
 			std::vector<std::string> proximityStr = GeneralUtils::SplitString(proxCompData[0].Proximities, ',');
@@ -1576,7 +1588,7 @@ void Entity::PickupItem(const LWOOBJID& objectID) {
 	InventoryComponent* inv = GetComponent<InventoryComponent>();
 	if (!inv) return;
 
-	CDObjectsTable* objectsTable = CDClientManager::Instance()->GetTable<CDObjectsTable>("Objects");
+	CDObjectsTable* objectsTable = CDClientManager::Instance().GetTable<CDObjectsTable>();
 
 	auto& droppedLoot = static_cast<Player*>(this)->GetDroppedLoot();
 
@@ -1589,10 +1601,10 @@ void Entity::PickupItem(const LWOOBJID& objectID) {
 
 			const CDObjects& object = objectsTable->GetByID(p.second.lot);
 			if (object.id != 0 && object.type == "Powerup") {
-				CDObjectSkillsTable* skillsTable = CDClientManager::Instance()->GetTable<CDObjectSkillsTable>("ObjectSkills");
+				CDObjectSkillsTable* skillsTable = CDClientManager::Instance().GetTable<CDObjectSkillsTable>();
 				std::vector<CDObjectSkills> skills = skillsTable->Query([=](CDObjectSkills entry) {return (entry.objectTemplate == p.second.lot); });
 				for (CDObjectSkills skill : skills) {
-					CDSkillBehaviorTable* skillBehTable = CDClientManager::Instance()->GetTable<CDSkillBehaviorTable>("SkillBehavior");
+					CDSkillBehaviorTable* skillBehTable = CDClientManager::Instance().GetTable<CDSkillBehaviorTable>();
 					CDSkillBehavior behaviorData = skillBehTable->GetSkillByID(skill.skillID);
 
 					SkillComponent::HandleUnmanaged(behaviorData.behaviorID, GetObjectID());

dGame/LeaderboardManager.cpp

@@ -8,6 +8,10 @@
 #include "dLogger.h"
 #include "dConfig.h"
 #include "CDClientManager.h"
+#include "GeneralUtils.h"
+#include "Entity.h"
+
+#include "CDActivitiesTable.h"
 
 Leaderboard::Leaderboard(uint32_t gameID, uint32_t infoType, bool weekly, std::vector<LeaderboardEntry> entries,
 	LWOOBJID relatedPlayer, LeaderboardType leaderboardType) {
@@ -273,7 +277,7 @@ void LeaderboardManager::SendLeaderboard(uint32_t gameID, InfoType infoType, boo
 }
 
 LeaderboardType LeaderboardManager::GetLeaderboardType(uint32_t gameID) {
-	auto* activitiesTable = CDClientManager::Instance()->GetTable<CDActivitiesTable>("Activities");
+	auto* activitiesTable = CDClientManager::Instance().GetTable<CDActivitiesTable>();
 	std::vector<CDActivities> activities = activitiesTable->Query([=](const CDActivities& entry) {
 		return (entry.ActivityID == gameID);
 		});

dGame/dBehaviors/Behavior.cpp

@@ -73,13 +73,14 @@
 #include "EntityManager.h"
 #include "RenderComponent.h"
 #include "DestroyableComponent.h"
+#include "CDBehaviorTemplateTable.h"
 
 std::unordered_map<uint32_t, Behavior*> Behavior::Cache = {};
 CDBehaviorParameterTable* Behavior::BehaviorParameterTable = nullptr;
 
 Behavior* Behavior::GetBehavior(const uint32_t behaviorId) {
 	if (BehaviorParameterTable == nullptr) {
-		BehaviorParameterTable = CDClientManager::Instance()->GetTable<CDBehaviorParameterTable>("BehaviorParameter");
+		BehaviorParameterTable = CDClientManager::Instance().GetTable<CDBehaviorParameterTable>();
 	}
 
 	const auto pair = Cache.find(behaviorId);
@@ -290,7 +291,7 @@ Behavior* Behavior::CreateBehavior(const uint32_t behaviorId) {
 }
 
 BehaviorTemplates Behavior::GetBehaviorTemplate(const uint32_t behaviorId) {
-	auto behaviorTemplateTable = CDClientManager::Instance()->GetTable<CDBehaviorTemplateTable>("BehaviorTemplate");
+	auto behaviorTemplateTable = CDClientManager::Instance().GetTable<CDBehaviorTemplateTable>();
 
 	BehaviorTemplates templateID = BehaviorTemplates::BEHAVIOR_EMPTY;
 	// Find behavior template by its behavior id.  Default to 0.
@@ -398,7 +399,7 @@ void Behavior::PlayFx(std::u16string type, const LWOOBJID target, const LWOOBJID
 }
 
 Behavior::Behavior(const uint32_t behaviorId) {
-	auto behaviorTemplateTable = CDClientManager::Instance()->GetTable<CDBehaviorTemplateTable>("BehaviorTemplate");
+	auto behaviorTemplateTable = CDClientManager::Instance().GetTable<CDBehaviorTemplateTable>();
 
 	CDBehaviorTemplate templateInDatabase{};
 
@@ -441,7 +442,7 @@ Behavior::Behavior(const uint32_t behaviorId) {
 
 float Behavior::GetFloat(const std::string& name, const float defaultValue) const {
 	// Get the behavior parameter entry and return its value.
-	if (!BehaviorParameterTable) BehaviorParameterTable = CDClientManager::Instance()->GetTable<CDBehaviorParameterTable>("BehaviorParameter");
+	if (!BehaviorParameterTable) BehaviorParameterTable = CDClientManager::Instance().GetTable<CDBehaviorParameterTable>();
 	return BehaviorParameterTable->GetValue(this->m_behaviorId, name, defaultValue);
 }
 
@@ -469,7 +470,7 @@ Behavior* Behavior::GetAction(float value) const {
 std::map<std::string, float> Behavior::GetParameterNames() const {
 	std::map<std::string, float> templatesInDatabase;
 	// Find behavior template by its behavior id.
-	if (!BehaviorParameterTable) BehaviorParameterTable = CDClientManager::Instance()->GetTable<CDBehaviorParameterTable>("BehaviorParameter");
+	if (!BehaviorParameterTable) BehaviorParameterTable = CDClientManager::Instance().GetTable<CDBehaviorParameterTable>();
 	if (BehaviorParameterTable) {
 		templatesInDatabase = BehaviorParameterTable->GetParametersByBehaviorID(this->m_behaviorId);
 	}

dGame/dBehaviors/OverTimeBehavior.cpp

@@ -9,6 +9,8 @@
 #include "CDClientDatabase.h"
 #include "CDClientManager.h"
 
+#include "CDSkillBehaviorTable.h"
+
 void OverTimeBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
 	const auto originator = context->originator;
 
@@ -39,7 +41,7 @@ void OverTimeBehavior::Load() {
 	m_Action = GetInt("action");
 	// Since m_Action is a skillID and not a behavior, get is correlated behaviorID.
 
-	CDSkillBehaviorTable* skillTable = CDClientManager::Instance()->GetTable<CDSkillBehaviorTable>("SkillBehavior");
+	CDSkillBehaviorTable* skillTable = CDClientManager::Instance().GetTable<CDSkillBehaviorTable>();
 	m_ActionBehaviorId = skillTable->GetSkillByID(m_Action).behaviorID;
 
 	m_Delay = GetFloat("delay");

dGame/dComponents/BaseCombatAIComponent.cpp

@@ -23,6 +23,8 @@
 #include "RebuildComponent.h"
 #include "DestroyableComponent.h"
 #include "Metrics.hpp"
+#include "CDComponentsRegistryTable.h"
+#include "CDPhysicsComponentTable.h"
 
 BaseCombatAIComponent::BaseCombatAIComponent(Entity* parent, const uint32_t id): Component(parent) {
 	m_Target = LWOOBJID_EMPTY;
@@ -105,10 +107,10 @@ BaseCombatAIComponent::BaseCombatAIComponent(Entity* parent, const uint32_t id):
 
 	int32_t collisionGroup = (COLLISION_GROUP_DYNAMIC | COLLISION_GROUP_ENEMY);
 
-	CDComponentsRegistryTable* componentRegistryTable = CDClientManager::Instance()->GetTable<CDComponentsRegistryTable>("ComponentsRegistry");
+	CDComponentsRegistryTable* componentRegistryTable = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
 	auto componentID = componentRegistryTable->GetByIDAndType(parent->GetLOT(), eReplicaComponentType::CONTROLLABLE_PHYSICS);
 
-	CDPhysicsComponentTable* physicsComponentTable = CDClientManager::Instance()->GetTable<CDPhysicsComponentTable>("PhysicsComponent");
+	CDPhysicsComponentTable* physicsComponentTable = CDClientManager::Instance().GetTable<CDPhysicsComponentTable>();
 
 	if (physicsComponentTable != nullptr) {
 		auto* info = physicsComponentTable->GetByID(componentID);

dGame/dComponents/BuffComponent.cpp

@@ -10,6 +10,7 @@
 #include "ControllablePhysicsComponent.h"
 #include "EntityManager.h"
 #include "CDClientManager.h"
+#include "CDSkillBehaviorTable.h"
 
 std::unordered_map<int32_t, std::vector<BuffParameter>> BuffComponent::m_Cache{};
 
@@ -101,7 +102,7 @@ void BuffComponent::ApplyBuff(const int32_t id, const float duration, const LWOO
 	const auto& parameters = GetBuffParameters(id);
 	for (const auto& parameter : parameters) {
 		if (parameter.name == "overtime") {
-			auto* behaviorTemplateTable = CDClientManager::Instance()->GetTable<CDSkillBehaviorTable>("SkillBehavior");
+			auto* behaviorTemplateTable = CDClientManager::Instance().GetTable<CDSkillBehaviorTable>();
 
 			behaviorID = behaviorTemplateTable->GetSkillByID(parameter.values[0]).behaviorID;
 			stacks = static_cast<int32_t>(parameter.values[1]);

dGame/dComponents/DestroyableComponent.cpp

@@ -34,6 +34,8 @@
 #include "WorldConfig.h"
 #include "eMissionTaskType.h"
 
+#include "CDComponentsRegistryTable.h"
+
 DestroyableComponent::DestroyableComponent(Entity* parent) : Component(parent) {
 	m_iArmor = 0;
 	m_fMaxArmor = 0.0f;
@@ -74,7 +76,7 @@ DestroyableComponent::~DestroyableComponent() {
 }
 
 void DestroyableComponent::Reinitialize(LOT templateID) {
-	CDComponentsRegistryTable* compRegistryTable = CDClientManager::Instance()->GetTable<CDComponentsRegistryTable>("ComponentsRegistry");
+	CDComponentsRegistryTable* compRegistryTable = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
 
 	int32_t buffComponentID = compRegistryTable->GetByIDAndType(templateID, eReplicaComponentType::BUFF);
 	int32_t collectibleComponentID = compRegistryTable->GetByIDAndType(templateID, eReplicaComponentType::COLLECTIBLE);
@@ -85,7 +87,7 @@ void DestroyableComponent::Reinitialize(LOT templateID) {
 	if (rebuildComponentID > 0) componentID = rebuildComponentID;
 	if (buffComponentID > 0) componentID = buffComponentID;
 
-	CDDestructibleComponentTable* destCompTable = CDClientManager::Instance()->GetTable<CDDestructibleComponentTable>("DestructibleComponent");
+	CDDestructibleComponentTable* destCompTable = CDClientManager::Instance().GetTable<CDDestructibleComponentTable>();
 	std::vector<CDDestructibleComponent> destCompData = destCompTable->Query([=](CDDestructibleComponent entry) { return (entry.id == componentID); });
 
 	if (componentID > 0) {

dGame/dComponents/InventoryComponent.cpp

@@ -30,6 +30,12 @@
 #include "CppScripts.h"
 #include "eMissionTaskType.h"
 
+#include "CDComponentsRegistryTable.h"
+#include "CDInventoryComponentTable.h"
+#include "CDScriptComponentTable.h"
+#include "CDObjectSkillsTable.h"
+#include "CDSkillBehaviorTable.h"
+
 InventoryComponent::InventoryComponent(Entity* parent, tinyxml2::XMLDocument* document): Component(parent) {
 	this->m_Dirty = true;
 	this->m_Equipped = {};
@@ -47,10 +53,10 @@ InventoryComponent::InventoryComponent(Entity* parent, tinyxml2::XMLDocument* do
 		return;
 	}
 
-	auto* compRegistryTable = CDClientManager::Instance()->GetTable<CDComponentsRegistryTable>("ComponentsRegistry");
+	auto* compRegistryTable = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
 	const auto componentId = compRegistryTable->GetByIDAndType(lot, eReplicaComponentType::INVENTORY);
 
-	auto* inventoryComponentTable = CDClientManager::Instance()->GetTable<CDInventoryComponentTable>("InventoryComponent");
+	auto* inventoryComponentTable = CDClientManager::Instance().GetTable<CDInventoryComponentTable>();
 	auto items = inventoryComponentTable->Query([=](const CDInventoryComponent entry) { return entry.id == componentId; });
 
 	auto slot = 0u;
@@ -912,11 +918,11 @@ void InventoryComponent::UnEquipItem(Item* item) {
 
 
 void InventoryComponent::EquipScripts(Item* equippedItem) {
-	CDComponentsRegistryTable* compRegistryTable = CDClientManager::Instance()->GetTable<CDComponentsRegistryTable>("ComponentsRegistry");
+	CDComponentsRegistryTable* compRegistryTable = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
 	if (!compRegistryTable) return;
 	int32_t scriptComponentID = compRegistryTable->GetByIDAndType(equippedItem->GetLot(), eReplicaComponentType::SCRIPT, -1);
 	if (scriptComponentID > -1) {
-		CDScriptComponentTable* scriptCompTable = CDClientManager::Instance()->GetTable<CDScriptComponentTable>("ScriptComponent");
+		CDScriptComponentTable* scriptCompTable = CDClientManager::Instance().GetTable<CDScriptComponentTable>();
 		CDScriptComponent scriptCompData = scriptCompTable->GetByID(scriptComponentID);
 		auto* itemScript = CppScripts::GetScript(m_Parent, scriptCompData.script_name);
 		if (!itemScript) {
@@ -927,11 +933,11 @@ void InventoryComponent::EquipScripts(Item* equippedItem) {
 }
 
 void InventoryComponent::UnequipScripts(Item* unequippedItem) {
-	CDComponentsRegistryTable* compRegistryTable = CDClientManager::Instance()->GetTable<CDComponentsRegistryTable>("ComponentsRegistry");
+	CDComponentsRegistryTable* compRegistryTable = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
 	if (!compRegistryTable) return;
 	int32_t scriptComponentID = compRegistryTable->GetByIDAndType(unequippedItem->GetLot(), eReplicaComponentType::SCRIPT, -1);
 	if (scriptComponentID > -1) {
-		CDScriptComponentTable* scriptCompTable = CDClientManager::Instance()->GetTable<CDScriptComponentTable>("ScriptComponent");
+		CDScriptComponentTable* scriptCompTable = CDClientManager::Instance().GetTable<CDScriptComponentTable>();
 		CDScriptComponent scriptCompData = scriptCompTable->GetByID(scriptComponentID);
 		auto* itemScript = CppScripts::GetScript(m_Parent, scriptCompData.script_name);
 		if (!itemScript) {
@@ -1306,7 +1312,7 @@ bool InventoryComponent::IsTransferInventory(eInventoryType type) {
 }
 
 uint32_t InventoryComponent::FindSkill(const LOT lot) {
-	auto* table = CDClientManager::Instance()->GetTable<CDObjectSkillsTable>("ObjectSkills");
+	auto* table = CDClientManager::Instance().GetTable<CDObjectSkillsTable>();
 
 	const auto results = table->Query([=](const CDObjectSkills& entry) {
 		return entry.objectTemplate == static_cast<unsigned int>(lot);
@@ -1324,8 +1330,8 @@ uint32_t InventoryComponent::FindSkill(const LOT lot) {
 std::vector<uint32_t> InventoryComponent::FindBuffs(Item* item, bool castOnEquip) const {
 	std::vector<uint32_t> buffs;
 	if (item == nullptr) return buffs;
-	auto* table = CDClientManager::Instance()->GetTable<CDObjectSkillsTable>("ObjectSkills");
+	auto* table = CDClientManager::Instance().GetTable<CDObjectSkillsTable>();
-	auto* behaviors = CDClientManager::Instance()->GetTable<CDSkillBehaviorTable>("SkillBehavior");
+	auto* behaviors = CDClientManager::Instance().GetTable<CDSkillBehaviorTable>();
 
 	const auto results = table->Query([=](const CDObjectSkills& entry) {
 		return entry.objectTemplate == static_cast<unsigned int>(item->GetLot());

dGame/dComponents/LevelProgressionComponent.cpp

@@ -4,6 +4,8 @@
 #include "CharacterComponent.h"
 #include "tinyxml2.h"
 
+#include "CDRewardsTable.h"
+
 LevelProgressionComponent::LevelProgressionComponent(Entity* parent) : Component(parent) {
 	m_Parent = parent;
 	m_Level = 1;
@@ -42,7 +44,7 @@ void LevelProgressionComponent::Serialize(RakNet::BitStream* outBitStream, bool
 }
 
 void LevelProgressionComponent::HandleLevelUp() {
-	auto* rewardsTable = CDClientManager::Instance()->GetTable<CDRewardsTable>("Rewards");
+	auto* rewardsTable = CDClientManager::Instance().GetTable<CDRewardsTable>();
 
 	const auto& rewards = rewardsTable->GetByLevelID(m_Level);
 	bool rewardingItem = rewards.size() > 0;

dGame/dComponents/MissionComponent.cpp

@@ -265,7 +265,7 @@ void MissionComponent::ForceProgressValue(uint32_t missionId, uint32_t taskType,
 }
 
 bool MissionComponent::GetMissionInfo(uint32_t missionId, CDMissions& result) {
-	auto* missionsTable = CDClientManager::Instance()->GetTable<CDMissionsTable>("Missions");
+	auto* missionsTable = CDClientManager::Instance().GetTable<CDMissionsTable>();
 
 	const auto missions = missionsTable->Query([=](const CDMissions& entry) {
 		return entry.id == static_cast<int>(missionId);
@@ -319,8 +319,8 @@ bool MissionComponent::LookForAchievements(eMissionTaskType type, int32_t value,
 
 	return any;
 #else
-	auto* missionTasksTable = CDClientManager::Instance()->GetTable<CDMissionTasksTable>("MissionTasks");
+	auto* missionTasksTable = CDClientManager::Instance().GetTable<CDMissionTasksTable>();
-	auto* missionsTable = CDClientManager::Instance()->GetTable<CDMissionsTable>("Missions");
+	auto* missionsTable = CDClientManager::Instance().GetTable<CDMissionsTable>();
 
 	auto tasks = missionTasksTable->Query([=](const CDMissionTasks& entry) {
 		return entry.taskType == static_cast<unsigned>(type);
@@ -406,8 +406,8 @@ const std::vector<uint32_t>& MissionComponent::QueryAchievements(eMissionTaskTyp
 	}
 
 	// Find relevent tables
-	auto* missionTasksTable = CDClientManager::Instance()->GetTable<CDMissionTasksTable>("MissionTasks");
+	auto* missionTasksTable = CDClientManager::Instance().GetTable<CDMissionTasksTable>();
-	auto* missionsTable = CDClientManager::Instance()->GetTable<CDMissionsTable>("Missions");
+	auto* missionsTable = CDClientManager::Instance().GetTable<CDMissionsTable>();
 
 	std::vector<uint32_t> result;
 

dGame/dComponents/MissionOfferComponent.cpp

@@ -16,6 +16,8 @@
 #include "MissionPrerequisites.h"
 #include "eMissionState.h"
 
+#include "CDComponentsRegistryTable.h"
+
 OfferedMission::OfferedMission(const uint32_t missionId, const bool offersMission, const bool acceptsMission) {
 	this->missionId = missionId;
 	this->offersMission = offersMission;
@@ -38,7 +40,7 @@ bool OfferedMission::GetAcceptMission() const {
 //------------------------ MissionOfferComponent below ------------------------
 
 MissionOfferComponent::MissionOfferComponent(Entity* parent, const LOT parentLot) : Component(parent) {
-	auto* compRegistryTable = CDClientManager::Instance()->GetTable<CDComponentsRegistryTable>("ComponentsRegistry");
+	auto* compRegistryTable = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
 
 	auto value = compRegistryTable->GetByIDAndType(parentLot, eReplicaComponentType::MISSION_OFFER, -1);
 
@@ -46,7 +48,7 @@ MissionOfferComponent::MissionOfferComponent(Entity* parent, const LOT parentLot
 		const uint32_t componentId = value;
 
 		// Now lookup the missions in the MissionNPCComponent table
-		auto* missionNpcComponentTable = CDClientManager::Instance()->GetTable<CDMissionNPCComponentTable>("MissionNPCComponent");
+		auto* missionNpcComponentTable = CDClientManager::Instance().GetTable<CDMissionNPCComponentTable>();
 
 		auto missions = missionNpcComponentTable->Query([=](const CDMissionNPCComponent& entry) {
 			return entry.id == static_cast<unsigned>(componentId);

dGame/dComponents/MovementAIComponent.cpp

@@ -11,6 +11,9 @@
 #include "SimplePhysicsComponent.h"
 #include "CDClientManager.h"
 
+#include "CDComponentsRegistryTable.h"
+#include "CDPhysicsComponentTable.h"
+
 std::map<LOT, float> MovementAIComponent::m_PhysicsSpeedCache = {};
 
 MovementAIComponent::MovementAIComponent(Entity* parent, MovementAIInfo info) : Component(parent) {
@@ -280,8 +283,8 @@ float MovementAIComponent::GetBaseSpeed(LOT lot) {
 		return it->second;
 	}
 
-	CDComponentsRegistryTable* componentRegistryTable = CDClientManager::Instance()->GetTable<CDComponentsRegistryTable>("ComponentsRegistry");
+	CDComponentsRegistryTable* componentRegistryTable = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
-	CDPhysicsComponentTable* physicsComponentTable = CDClientManager::Instance()->GetTable<CDPhysicsComponentTable>("PhysicsComponent");
+	CDPhysicsComponentTable* physicsComponentTable = CDClientManager::Instance().GetTable<CDPhysicsComponentTable>();
 
 	int32_t componentID;
 	CDPhysicsComponent* physicsComponent = nullptr;

dGame/dComponents/PhantomPhysicsComponent.cpp

@@ -143,10 +143,10 @@ PhantomPhysicsComponent::PhantomPhysicsComponent(Entity* parent) : Component(par
 	*/
 
 	if (!m_HasCreatedPhysics) {
-		CDComponentsRegistryTable* compRegistryTable = CDClientManager::Instance()->GetTable<CDComponentsRegistryTable>("ComponentsRegistry");
+		CDComponentsRegistryTable* compRegistryTable = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
 		auto componentID = compRegistryTable->GetByIDAndType(m_Parent->GetLOT(), eReplicaComponentType::PHANTOM_PHYSICS);
 
-		CDPhysicsComponentTable* physComp = CDClientManager::Instance()->GetTable<CDPhysicsComponentTable>("PhysicsComponent");
+		CDPhysicsComponentTable* physComp = CDClientManager::Instance().GetTable<CDPhysicsComponentTable>();
 
 		if (physComp == nullptr) return;
 
@@ -253,10 +253,10 @@ void PhantomPhysicsComponent::CreatePhysics() {
 		y = m_Parent->GetVar<float>(u"primitiveModelValueY");
 		z = m_Parent->GetVar<float>(u"primitiveModelValueZ");
 	} else {
-		CDComponentsRegistryTable* compRegistryTable = CDClientManager::Instance()->GetTable<CDComponentsRegistryTable>("ComponentsRegistry");
+		CDComponentsRegistryTable* compRegistryTable = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
 		auto componentID = compRegistryTable->GetByIDAndType(m_Parent->GetLOT(), eReplicaComponentType::PHANTOM_PHYSICS);
 
-		CDPhysicsComponentTable* physComp = CDClientManager::Instance()->GetTable<CDPhysicsComponentTable>("PhysicsComponent");
+		CDPhysicsComponentTable* physComp = CDClientManager::Instance().GetTable<CDPhysicsComponentTable>();
 
 		if (physComp == nullptr) return;
 

dGame/dComponents/PropertyEntranceComponent.cpp

@@ -16,7 +16,7 @@
 PropertyEntranceComponent::PropertyEntranceComponent(uint32_t componentID, Entity* parent) : Component(parent) {
 	this->propertyQueries = {};
 
-	auto table = CDClientManager::Instance()->GetTable<CDPropertyEntranceComponentTable>("PropertyEntranceComponent");
+	auto table = CDClientManager::Instance().GetTable<CDPropertyEntranceComponentTable>();
 	const auto& entry = table->GetByID(componentID);
 
 	this->m_MapID = entry.mapID;

dGame/dComponents/RailActivatorComponent.cpp

@@ -10,8 +10,7 @@
 
 RailActivatorComponent::RailActivatorComponent(Entity* parent, int32_t componentID) : Component(parent) {
 	m_ComponentID = componentID;
-	const auto tableData = CDClientManager::Instance()
+	const auto tableData = CDClientManager::Instance().GetTable<CDRailActivatorComponentTable>()->GetEntryByID(componentID);;
-		->GetTable<CDRailActivatorComponentTable>("RailActivatorComponent")->GetEntryByID(componentID);
 
 	m_Path = parent->GetVar<std::u16string>(u"rail_path");
 	m_PathDirection = parent->GetVar<bool>(u"rail_path_direction");

dGame/dComponents/RenderComponent.cpp

@@ -20,7 +20,7 @@ RenderComponent::RenderComponent(Entity* parent) : Component(parent) {
 	return;
 
 	/*
-	auto* table = CDClientManager::Instance()->GetTable<CDComponentsRegistryTable>("ComponentsRegistry");
+	auto* table = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
 
 	const auto entry = table->GetByIDAndType(parent->GetLOT(), eReplicaComponentType::RENDER);
 

dGame/dComponents/ScriptedActivityComponent.cpp

@@ -22,9 +22,13 @@
 #include "Loot.h"
 #include "eMissionTaskType.h"
 
+#include "CDCurrencyTableTable.h"
+#include "CDActivityRewardsTable.h"
+#include "CDActivitiesTable.h"
+
 ScriptedActivityComponent::ScriptedActivityComponent(Entity* parent, int activityID) : Component(parent) {
 	m_ActivityID = activityID;
-	CDActivitiesTable* activitiesTable = CDClientManager::Instance()->GetTable<CDActivitiesTable>("Activities");
+	CDActivitiesTable* activitiesTable = CDClientManager::Instance().GetTable<CDActivitiesTable>();
 	std::vector<CDActivities> activities = activitiesTable->Query([=](CDActivities entry) {return (entry.ActivityID == m_ActivityID); });
 
 	for (CDActivities activity : activities) {
@@ -53,7 +57,7 @@ ScriptedActivityComponent::ScriptedActivityComponent(Entity* parent, int activit
 
 	if (destroyableComponent) {
 		// check for LMIs and set the loot LMIs
-		CDActivityRewardsTable* activityRewardsTable = CDClientManager::Instance()->GetTable<CDActivityRewardsTable>("ActivityRewards");
+		CDActivityRewardsTable* activityRewardsTable = CDClientManager::Instance().GetTable<CDActivityRewardsTable>();
 		std::vector<CDActivityRewards> activityRewards = activityRewardsTable->Query([=](CDActivityRewards entry) {return (entry.LootMatrixIndex == destroyableComponent->GetLootMatrixID()); });
 
 		uint32_t startingLMI = 0;
@@ -94,7 +98,7 @@ void ScriptedActivityComponent::Serialize(RakNet::BitStream* outBitStream, bool
 }
 
 void ScriptedActivityComponent::ReloadConfig() {
-	CDActivitiesTable* activitiesTable = CDClientManager::Instance()->GetTable<CDActivitiesTable>("Activities");
+	CDActivitiesTable* activitiesTable = CDClientManager::Instance().GetTable<CDActivitiesTable>();
 	std::vector<CDActivities> activities = activitiesTable->Query([=](CDActivities entry) {return (entry.ActivityID == m_ActivityID); });
 	for (auto activity : activities) {
 		auto mapID = m_ActivityInfo.instanceMapID;
@@ -557,14 +561,14 @@ void ActivityInstance::RewardParticipant(Entity* participant) {
 	}
 
 	// First, get the activity data
-	auto* activityRewardsTable = CDClientManager::Instance()->GetTable<CDActivityRewardsTable>("ActivityRewards");
+	auto* activityRewardsTable = CDClientManager::Instance().GetTable<CDActivityRewardsTable>();
 	std::vector<CDActivityRewards> activityRewards = activityRewardsTable->Query([=](CDActivityRewards entry) { return (entry.objectTemplate == m_ActivityInfo.ActivityID); });
 
 	if (!activityRewards.empty()) {
 		uint32_t minCoins = 0;
 		uint32_t maxCoins = 0;
 
-		auto* currencyTableTable = CDClientManager::Instance()->GetTable<CDCurrencyTableTable>("CurrencyTable");
+		auto* currencyTableTable = CDClientManager::Instance().GetTable<CDCurrencyTableTable>();
 		std::vector<CDCurrencyTable> currencyTable = currencyTableTable->Query([=](CDCurrencyTable entry) { return (entry.currencyIndex == activityRewards[0].CurrencyIndex && entry.npcminlevel == 1); });
 
 		if (!currencyTable.empty()) {

dGame/dComponents/ScriptedActivityComponent.h

@@ -13,6 +13,8 @@
 #include "Component.h"
 #include "eReplicaComponentType.h"
 
+#include "CDActivitiesTable.h"
+
  /**
   * Represents an instance of an activity, having participants and score
   */

dGame/dComponents/SkillComponent.cpp

@@ -24,6 +24,8 @@
 #include "DoClientProjectileImpact.h"
 #include "CDClientManager.h"
 
+#include "CDSkillBehaviorTable.h"
+
 ProjectileSyncEntry::ProjectileSyncEntry() {
 }
 
@@ -220,7 +222,7 @@ bool SkillComponent::CastSkill(const uint32_t skillId, LWOOBJID target, const LW
 
 	// if it's not in the cache look it up and cache it
 	if (pair == m_skillBehaviorCache.end()) {
-		auto skillTable = CDClientManager::Instance()->GetTable<CDSkillBehaviorTable>("SkillBehavior");
+		auto skillTable = CDClientManager::Instance().GetTable<CDSkillBehaviorTable>();
 		behaviorId = skillTable->GetSkillByID(skillId).behaviorID;
 		m_skillBehaviorCache.insert_or_assign(skillId, behaviorId);
 	} else {