Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-25 06:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove non cstdint integer types in client ORM (#1405)

Browse Source
This commit is contained in:
David Markowitz 2024-01-08 23:54:14 -08:00 committed by GitHub
parent 4a50c60559
commit e0ddbce8e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
64 changed files with 252 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dDatabase/CDClientDatabase/CDClientTables/CDActivitiesTable.cpp
View File

@ -2,7 +2,7 @@
void CDActivitiesTable::LoadValuesFromDatabase() { void CDActivitiesTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM Activities"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM Activities");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

26
dDatabase/CDClientDatabase/CDClientTables/CDActivitiesTable.h
View File

@ -4,22 +4,22 @@
#include "CDTable.h" #include "CDTable.h"
struct CDActivities { struct CDActivities {
unsigned int ActivityID; uint32_t ActivityID;
unsigned int locStatus; uint32_t locStatus;
unsigned int instanceMapID; uint32_t instanceMapID;
unsigned int minTeams; uint32_t minTeams;
unsigned int maxTeams; uint32_t maxTeams;
unsigned int minTeamSize; uint32_t minTeamSize;
unsigned int maxTeamSize; uint32_t maxTeamSize;
unsigned int waitTime; uint32_t waitTime;
unsigned int startDelay; uint32_t startDelay;
bool requiresUniqueData; bool requiresUniqueData;
unsigned int leaderboardType; uint32_t leaderboardType;
bool localize; bool localize;
int optionalCostLOT; int32_t optionalCostLOT;
int optionalCostCount; int32_t optionalCostCount;
bool showUIRewards; bool showUIRewards;
unsigned int CommunityActivityFlagID; uint32_t CommunityActivityFlagID;
std::string gate_version; std::string gate_version;
bool noTeamLootOnDeath; bool noTeamLootOnDeath;
float optionalPercentage; float optionalPercentage;

2
dDatabase/CDClientDatabase/CDClientTables/CDActivityRewardsTable.cpp
View File

@ -3,7 +3,7 @@
void CDActivityRewardsTable::LoadValuesFromDatabase() { void CDActivityRewardsTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ActivityRewards"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ActivityRewards");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

12
dDatabase/CDClientDatabase/CDClientTables/CDActivityRewardsTable.h
View File

@ -4,12 +4,12 @@
#include "CDTable.h" #include "CDTable.h"
struct CDActivityRewards { struct CDActivityRewards {
unsigned int objectTemplate; //!< The object template (?) uint32_t objectTemplate; //!< The object template (?)
unsigned int ActivityRewardIndex; //!< The activity reward index uint32_t ActivityRewardIndex; //!< The activity reward index
int activityRating; //!< The activity rating int32_t activityRating; //!< The activity rating
unsigned int LootMatrixIndex; //!< The loot matrix index uint32_t LootMatrixIndex; //!< The loot matrix index
unsigned int CurrencyIndex; //!< The currency index uint32_t CurrencyIndex; //!< The currency index
unsigned int ChallengeRating; //!< The challenge rating uint32_t ChallengeRating; //!< The challenge rating
std::string description; //!< The description std::string description; //!< The description
}; };

6
dDatabase/CDClientDatabase/CDClientTables/CDAnimationsTable.h
View File

@ -4,13 +4,13 @@
#include <list> #include <list>
struct CDAnimation { struct CDAnimation {
// unsigned int animationGroupID; // uint32_t animationGroupID;
// std::string animation_type; // std::string animation_type;
// The above two are a pair to represent a primary key in the map. // The above two are a pair to represent a primary key in the map.
std::string animation_name; //!< The animation name std::string animation_name; //!< The animation name
float chance_to_play; //!< The chance to play the animation float chance_to_play; //!< The chance to play the animation
UNUSED_COLUMN(unsigned int min_loops;) //!< The minimum number of loops UNUSED_COLUMN(uint32_t min_loops;) //!< The minimum number of loops
UNUSED_COLUMN(unsigned int max_loops;) //!< The maximum number of loops UNUSED_COLUMN(uint32_t max_loops;) //!< The maximum number of loops
float animation_length; //!< The animation length float animation_length; //!< The animation length
UNUSED_COLUMN(bool hideEquip;) //!< Whether or not to hide the equip UNUSED_COLUMN(bool hideEquip;) //!< Whether or not to hide the equip
UNUSED_COLUMN(bool ignoreUpperBody;) //!< Whether or not to ignore the upper body UNUSED_COLUMN(bool ignoreUpperBody;) //!< Whether or not to ignore the upper body

2
dDatabase/CDClientDatabase/CDClientTables/CDBehaviorTemplateTable.cpp
View File

@ -3,7 +3,7 @@
void CDBehaviorTemplateTable::LoadValuesFromDatabase() { void CDBehaviorTemplateTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM BehaviorTemplate"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM BehaviorTemplate");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

6
dDatabase/CDClientDatabase/CDClientTables/CDBehaviorTemplateTable.h
View File

@ -6,9 +6,9 @@
#include <unordered_set> #include <unordered_set>
struct CDBehaviorTemplate { struct CDBehaviorTemplate {
unsigned int behaviorID; //!< The Behavior ID uint32_t behaviorID; //!< The Behavior ID
unsigned int templateID; //!< The Template ID (LOT) uint32_t templateID; //!< The Template ID (LOT)
unsigned int effectID; //!< The Effect ID attached uint32_t effectID; //!< The Effect ID attached
std::unordered_set<std::string>::iterator effectHandle; //!< The effect handle std::unordered_set<std::string>::iterator effectHandle; //!< The effect handle
}; };

2
dDatabase/CDClientDatabase/CDClientTables/CDBrickIDTableTable.cpp
View File

@ -3,7 +3,7 @@
void CDBrickIDTableTable::LoadValuesFromDatabase() { void CDBrickIDTableTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM BrickIDTable"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM BrickIDTable");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

4
dDatabase/CDClientDatabase/CDClientTables/CDBrickIDTableTable.h
View File

@ -10,8 +10,8 @@
//! BrickIDTable Entry Struct //! BrickIDTable Entry Struct
struct CDBrickIDTable { struct CDBrickIDTable {
unsigned int NDObjectID; uint32_t NDObjectID;
unsigned int LEGOBrickID; uint32_t LEGOBrickID;
}; };

4
dDatabase/CDClientDatabase/CDClientTables/CDComponentsRegistryTable.h
View File

@ -7,9 +7,9 @@
enum class eReplicaComponentType : uint32_t; enum class eReplicaComponentType : uint32_t;
struct CDComponentsRegistry { struct CDComponentsRegistry {
unsigned int id; //!< The LOT is used as the ID uint32_t id; //!< The LOT is used as the ID
eReplicaComponentType component_type; //!< See ComponentTypes enum for values eReplicaComponentType component_type; //!< See ComponentTypes enum for values
unsigned int component_id; //!< The ID used within the component's table (0 may either mean it's non-networked, or that the ID is actually 0 uint32_t component_id; //!< The ID used within the component's table (0 may either mean it's non-networked, or that the ID is actually 0
}; };

2
dDatabase/CDClientDatabase/CDClientTables/CDCurrencyTableTable.cpp
View File

@ -4,7 +4,7 @@
void CDCurrencyTableTable::LoadValuesFromDatabase() { void CDCurrencyTableTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM CurrencyTable"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM CurrencyTable");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

10
dDatabase/CDClientDatabase/CDClientTables/CDCurrencyTableTable.h
View File

@ -10,11 +10,11 @@
//! CurrencyTable Struct //! CurrencyTable Struct
struct CDCurrencyTable { struct CDCurrencyTable {
unsigned int currencyIndex; //!< The Currency Index uint32_t currencyIndex; //!< The Currency Index
unsigned int npcminlevel; //!< The minimum level of the npc uint32_t npcminlevel; //!< The minimum level of the npc
unsigned int minvalue; //!< The minimum currency uint32_t minvalue; //!< The minimum currency
unsigned int maxvalue; //!< The maximum currency uint32_t maxvalue; //!< The maximum currency
unsigned int id; //!< The ID of the currency index uint32_t id; //!< The ID of the currency index
}; };
//! CurrencyTable table //! CurrencyTable table

2
dDatabase/CDClientDatabase/CDClientTables/CDDestructibleComponentTable.cpp
View File

@ -2,7 +2,7 @@
void CDDestructibleComponentTable::LoadValuesFromDatabase() { void CDDestructibleComponentTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM DestructibleComponent"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM DestructibleComponent");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

20
dDatabase/CDClientDatabase/CDClientTables/CDDestructibleComponentTable.h
View File

@ -4,20 +4,20 @@
#include "CDTable.h" #include "CDTable.h"
struct CDDestructibleComponent { struct CDDestructibleComponent {
unsigned int id; //!< The component ID from the ComponentsRegistry Table uint32_t id; //!< The component ID from the ComponentsRegistry Table
int faction; //!< The Faction ID of the object int32_t faction; //!< The Faction ID of the object
std::string factionList; //!< A list of the faction IDs std::string factionList; //!< A list of the faction IDs
int life; //!< The amount of life of the object int32_t life; //!< The amount of life of the object
unsigned int imagination; //!< The amount of imagination of the object uint32_t imagination; //!< The amount of imagination of the object
int LootMatrixIndex; //!< The Loot Matrix Index int32_t LootMatrixIndex; //!< The Loot Matrix Index
int CurrencyIndex; //!< The Currency Index int32_t CurrencyIndex; //!< The Currency Index
unsigned int level; //!< ??? uint32_t level; //!< ???
float armor; //!< The amount of armor of the object float armor; //!< The amount of armor of the object
unsigned int death_behavior; //!< The behavior ID of the death behavior uint32_t death_behavior; //!< The behavior ID of the death behavior
bool isnpc; //!< Whether or not the object is an NPC bool isnpc; //!< Whether or not the object is an NPC
unsigned int attack_priority; //!< ??? uint32_t attack_priority; //!< ???
bool isSmashable; //!< Whether or not the object is smashable bool isSmashable; //!< Whether or not the object is smashable
int difficultyLevel; //!< ??? int32_t difficultyLevel; //!< ???
}; };
class CDDestructibleComponentTable : public CDTable<CDDestructibleComponentTable> { class CDDestructibleComponentTable : public CDTable<CDDestructibleComponentTable> {

2
dDatabase/CDClientDatabase/CDClientTables/CDEmoteTable.cpp
View File

@ -20,7 +20,7 @@ void CDEmoteTableTable::LoadValuesFromDatabase() {
tableData.finalize(); tableData.finalize();
} }
CDEmoteTable* CDEmoteTableTable::GetEmote(int id) { CDEmoteTable* CDEmoteTableTable::GetEmote(int32_t id) {
auto itr = entries.find(id); auto itr = entries.find(id);
return itr != entries.end() ? &itr->second : nullptr; return itr != entries.end() ? &itr->second : nullptr;
} }

8
dDatabase/CDClientDatabase/CDClientTables/CDEmoteTable.h
View File

@ -16,11 +16,11 @@ struct CDEmoteTable {
gateVersion = ""; gateVersion = "";
} }
int ID; int32_t ID;
std::string animationName; std::string animationName;
std::string iconFilename; std::string iconFilename;
int locState; int32_t locState;
int channel; int32_t channel;
bool locked; bool locked;
bool localize; bool localize;
std::string gateVersion; std::string gateVersion;
@ -33,5 +33,5 @@ private:
public: public:
void LoadValuesFromDatabase(); void LoadValuesFromDatabase();
// Returns an emote by ID // Returns an emote by ID
CDEmoteTable* GetEmote(int id); CDEmoteTable* GetEmote(int32_t id);
}; };

2
dDatabase/CDClientDatabase/CDClientTables/CDFeatureGatingTable.cpp
View File

@ -3,7 +3,7 @@
void CDFeatureGatingTable::LoadValuesFromDatabase() { void CDFeatureGatingTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM FeatureGating"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM FeatureGating");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

2
dDatabase/CDClientDatabase/CDClientTables/CDInventoryComponentTable.cpp
View File

@ -3,7 +3,7 @@
void CDInventoryComponentTable::LoadValuesFromDatabase() { void CDInventoryComponentTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM InventoryComponent"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM InventoryComponent");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

6
dDatabase/CDClientDatabase/CDClientTables/CDInventoryComponentTable.h
View File

@ -4,9 +4,9 @@
#include "CDTable.h" #include "CDTable.h"
struct CDInventoryComponent { struct CDInventoryComponent {
unsigned int id; //!< The component ID for this object uint32_t id; //!< The component ID for this object
unsigned int itemid; //!< The LOT of the object uint32_t itemid; //!< The LOT of the object
unsigned int count; //!< The count of the items the object has uint32_t count; //!< The count of the items the object has
bool equip; //!< Whether or not to equip the item bool equip; //!< Whether or not to equip the item
}; };

4
dDatabase/CDClientDatabase/CDClientTables/CDItemComponentTable.cpp
View File

@ -5,7 +5,7 @@ CDItemComponent CDItemComponentTable::Default = {};
void CDItemComponentTable::LoadValuesFromDatabase() { void CDItemComponentTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ItemComponent"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ItemComponent");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);
@ -69,7 +69,7 @@ void CDItemComponentTable::LoadValuesFromDatabase() {
tableData.finalize(); tableData.finalize();
} }
const CDItemComponent& CDItemComponentTable::GetItemComponentByID(unsigned int skillID) { const CDItemComponent& CDItemComponentTable::GetItemComponentByID(uint32_t skillID) {
const auto& it = this->entries.find(skillID); const auto& it = this->entries.find(skillID);
if (it != this->entries.end()) { if (it != this->entries.end()) {
return it->second; return it->second;

52
dDatabase/CDClientDatabase/CDClientTables/CDItemComponentTable.h
View File

@ -5,60 +5,60 @@
#include "dCommonVars.h" #include "dCommonVars.h"
struct CDItemComponent { struct CDItemComponent {
unsigned int id; //!< The Component ID uint32_t id; //!< The Component ID
std::string equipLocation; //!< The equip location std::string equipLocation; //!< The equip location
unsigned int baseValue; //!< The monetary base value of the item uint32_t baseValue; //!< The monetary base value of the item
bool isKitPiece; //!< Whether or not the item belongs to a kit bool isKitPiece; //!< Whether or not the item belongs to a kit
unsigned int rarity; //!< The rarity of the item uint32_t rarity; //!< The rarity of the item
unsigned int itemType; //!< The item type uint32_t itemType; //!< The item type
int64_t itemInfo; //!< The item info int64_t itemInfo; //!< The item info
bool inLootTable; //!< Whether or not the item is in a loot table bool inLootTable; //!< Whether or not the item is in a loot table
bool inVendor; //!< Whether or not the item is in a vendor inventory bool inVendor; //!< Whether or not the item is in a vendor inventory
bool isUnique; //!< ??? bool isUnique; //!< ???
bool isBOP; //!< ??? bool isBOP; //!< ???
bool isBOE; //!< ??? bool isBOE; //!< ???
unsigned int reqFlagID; //!< User must have completed this flag to get the item uint32_t reqFlagID; //!< User must have completed this flag to get the item
unsigned int reqSpecialtyID; //!< ??? uint32_t reqSpecialtyID; //!< ???
unsigned int reqSpecRank; //!< ??? uint32_t reqSpecRank; //!< ???
unsigned int reqAchievementID; //!< The required achievement must be completed uint32_t reqAchievementID; //!< The required achievement must be completed
unsigned int stackSize; //!< The stack size of the item uint32_t stackSize; //!< The stack size of the item
unsigned int color1; //!< Something to do with item color... uint32_t color1; //!< Something to do with item color...
unsigned int decal; //!< The decal of the item uint32_t decal; //!< The decal of the item
unsigned int offsetGroupID; //!< Something to do with group IDs uint32_t offsetGroupID; //!< Something to do with group IDs
unsigned int buildTypes; //!< Something to do with building uint32_t buildTypes; //!< Something to do with building
std::string reqPrecondition; //!< The required precondition std::string reqPrecondition; //!< The required precondition
unsigned int animationFlag; //!< The Animation Flag uint32_t animationFlag; //!< The Animation Flag
unsigned int equipEffects; //!< The effect played when the item is equipped uint32_t equipEffects; //!< The effect played when the item is equipped
bool readyForQA; //!< ??? bool readyForQA; //!< ???
unsigned int itemRating; //!< ??? uint32_t itemRating; //!< ???
bool isTwoHanded; //!< Whether or not the item is double handed bool isTwoHanded; //!< Whether or not the item is double handed
unsigned int minNumRequired; //!< Maybe the minimum number required for a mission, or to own this object? uint32_t minNumRequired; //!< Maybe the minimum number required for a mission, or to own this object?
unsigned int delResIndex; //!< ??? uint32_t delResIndex; //!< ???
unsigned int currencyLOT; //!< ??? uint32_t currencyLOT; //!< ???
unsigned int altCurrencyCost; //!< ??? uint32_t altCurrencyCost; //!< ???
std::string subItems; //!< A comma seperate string of sub items (maybe for multi-itemed things like faction test gear set) std::string subItems; //!< A comma seperate string of sub items (maybe for multi-itemed things like faction test gear set)
UNUSED(std::string audioEventUse); //!< ??? UNUSED(std::string audioEventUse); //!< ???
bool noEquipAnimation; //!< Whether or not there is an equip animation bool noEquipAnimation; //!< Whether or not there is an equip animation
unsigned int commendationLOT; //!< The commendation LOT uint32_t commendationLOT; //!< The commendation LOT
unsigned int commendationCost; //!< The commendation cost uint32_t commendationCost; //!< The commendation cost
UNUSED(std::string audioEquipMetaEventSet); //!< ??? UNUSED(std::string audioEquipMetaEventSet); //!< ???
std::string currencyCosts; //!< Used for crafting std::string currencyCosts; //!< Used for crafting
UNUSED(std::string ingredientInfo); //!< Unused UNUSED(std::string ingredientInfo); //!< Unused
unsigned int locStatus; //!< ??? uint32_t locStatus; //!< ???
unsigned int forgeType; //!< Forge Type uint32_t forgeType; //!< Forge Type
float SellMultiplier; //!< Something to do with early vendors perhaps (but replaced) float SellMultiplier; //!< Something to do with early vendors perhaps (but replaced)
}; };
class CDItemComponentTable : public CDTable<CDItemComponentTable> { class CDItemComponentTable : public CDTable<CDItemComponentTable> {
private: private:
std::map<unsigned int, CDItemComponent> entries; std::map<uint32_t, CDItemComponent> entries;
public: public:
void LoadValuesFromDatabase(); void LoadValuesFromDatabase();
static std::map<LOT, uint32_t> ParseCraftingCurrencies(const CDItemComponent& itemComponent); 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); const CDItemComponent& GetItemComponentByID(uint32_t skillID);
static CDItemComponent Default; static CDItemComponent Default;
}; };

4
dDatabase/CDClientDatabase/CDClientTables/CDItemSetSkillsTable.cpp
View File

@ -3,7 +3,7 @@
void CDItemSetSkillsTable::LoadValuesFromDatabase() { void CDItemSetSkillsTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ItemSetSkills"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ItemSetSkills");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);
@ -44,7 +44,7 @@ const std::vector<CDItemSetSkills>& CDItemSetSkillsTable::GetEntries() const {
return this->entries; return this->entries;
} }
std::vector<CDItemSetSkills> CDItemSetSkillsTable::GetBySkillID(unsigned int SkillSetID) { std::vector<CDItemSetSkills> CDItemSetSkillsTable::GetBySkillID(uint32_t SkillSetID) {
std::vector<CDItemSetSkills> toReturn; std::vector<CDItemSetSkills> toReturn;
for (CDItemSetSkills entry : this->entries) { for (CDItemSetSkills entry : this->entries) {

8
dDatabase/CDClientDatabase/CDClientTables/CDItemSetSkillsTable.h
View File

@ -4,9 +4,9 @@
#include "CDTable.h" #include "CDTable.h"
struct CDItemSetSkills { struct CDItemSetSkills {
unsigned int SkillSetID; //!< The skill set ID uint32_t SkillSetID; //!< The skill set ID
unsigned int SkillID; //!< The skill ID uint32_t SkillID; //!< The skill ID
unsigned int SkillCastType; //!< The skill cast type uint32_t SkillCastType; //!< The skill cast type
}; };
class CDItemSetSkillsTable : public CDTable<CDItemSetSkillsTable> { class CDItemSetSkillsTable : public CDTable<CDItemSetSkillsTable> {
@ -20,5 +20,5 @@ public:
const std::vector<CDItemSetSkills>& GetEntries() const; const std::vector<CDItemSetSkills>& GetEntries() const;
std::vector<CDItemSetSkills> GetBySkillID(unsigned int SkillSetID); std::vector<CDItemSetSkills> GetBySkillID(uint32_t SkillSetID);
}; };

2
dDatabase/CDClientDatabase/CDClientTables/CDItemSetsTable.cpp
View File

@ -3,7 +3,7 @@
void CDItemSetsTable::LoadValuesFromDatabase() { void CDItemSetsTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ItemSets"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ItemSets");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

22
dDatabase/CDClientDatabase/CDClientTables/CDItemSetsTable.h
View File

@ -4,20 +4,20 @@
#include "CDTable.h" #include "CDTable.h"
struct CDItemSets { struct CDItemSets {
unsigned int setID; //!< The item set ID uint32_t setID; //!< The item set ID
unsigned int locStatus; //!< The loc status uint32_t locStatus; //!< The loc status
std::string itemIDs; //!< THe item IDs std::string itemIDs; //!< THe item IDs
unsigned int kitType; //!< The item kit type uint32_t kitType; //!< The item kit type
unsigned int kitRank; //!< The item kit rank uint32_t kitRank; //!< The item kit rank
unsigned int kitImage; //!< The item kit image uint32_t kitImage; //!< The item kit image
unsigned int skillSetWith2; //!< The skill set with 2 uint32_t skillSetWith2; //!< The skill set with 2
unsigned int skillSetWith3; //!< The skill set with 3 uint32_t skillSetWith3; //!< The skill set with 3
unsigned int skillSetWith4; //!< The skill set with 4 uint32_t skillSetWith4; //!< The skill set with 4
unsigned int skillSetWith5; //!< The skill set with 5 uint32_t skillSetWith5; //!< The skill set with 5
unsigned int skillSetWith6; //!< The skill set with 6 uint32_t skillSetWith6; //!< The skill set with 6
bool localize; //!< Whether or localize bool localize; //!< Whether or localize
std::string gate_version; //!< The gate version std::string gate_version; //!< The gate version
unsigned int kitID; //!< The kit ID uint32_t kitID; //!< The kit ID
float priority; //!< The priority float priority; //!< The priority
}; };

2
dDatabase/CDClientDatabase/CDClientTables/CDLevelProgressionLookupTable.cpp
View File

@ -3,7 +3,7 @@
void CDLevelProgressionLookupTable::LoadValuesFromDatabase() { void CDLevelProgressionLookupTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM LevelProgressionLookup"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM LevelProgressionLookup");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

4
dDatabase/CDClientDatabase/CDClientTables/CDLevelProgressionLookupTable.h
View File

@ -4,8 +4,8 @@
#include "CDTable.h" #include "CDTable.h"
struct CDLevelProgressionLookup { struct CDLevelProgressionLookup {
unsigned int id; //!< The Level ID uint32_t id; //!< The Level ID
unsigned int requiredUScore; //!< The required LEGO Score uint32_t requiredUScore; //!< The required LEGO Score
std::string BehaviorEffect; //!< The behavior effect attached to this std::string BehaviorEffect; //!< The behavior effect attached to this
}; };

2
dDatabase/CDClientDatabase/CDClientTables/CDLootMatrixTable.cpp
View File

@ -16,7 +16,7 @@ CDLootMatrix CDLootMatrixTable::ReadRow(CppSQLite3Query& tableData) const {
void CDLootMatrixTable::LoadValuesFromDatabase() { void CDLootMatrixTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM LootMatrix"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM LootMatrix");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

10
dDatabase/CDClientDatabase/CDClientTables/CDLootMatrixTable.h
View File

@ -4,12 +4,12 @@
#include "CDTable.h" #include "CDTable.h"
struct CDLootMatrix { struct CDLootMatrix {
unsigned int LootTableIndex; //!< The Loot Table Index uint32_t LootTableIndex; //!< The Loot Table Index
unsigned int RarityTableIndex; //!< The Rarity Table Index uint32_t RarityTableIndex; //!< The Rarity Table Index
float percent; //!< The percent that this matrix is used? float percent; //!< The percent that this matrix is used?
unsigned int minToDrop; //!< The minimum amount of loot from this matrix to drop uint32_t minToDrop; //!< The minimum amount of loot from this matrix to drop
unsigned int maxToDrop; //!< The maximum amount of loot from this matrix to drop uint32_t maxToDrop; //!< The maximum amount of loot from this matrix to drop
unsigned int flagID; //!< ??? uint32_t flagID; //!< ???
UNUSED(std::string gate_version); //!< The Gate Version UNUSED(std::string gate_version); //!< The Gate Version
}; };

2
dDatabase/CDClientDatabase/CDClientTables/CDLootTableTable.cpp
View File

@ -40,7 +40,7 @@ CDLootTable CDLootTableTable::ReadRow(CppSQLite3Query& tableData) const {
void CDLootTableTable::LoadValuesFromDatabase() { void CDLootTableTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM LootTable"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM LootTable");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

6
dDatabase/CDClientDatabase/CDClientTables/CDLootTableTable.h
View File

@ -4,10 +4,10 @@
#include "CDTable.h" #include "CDTable.h"
struct CDLootTable { struct CDLootTable {
unsigned int itemid; //!< The LOT of the item uint32_t itemid; //!< The LOT of the item
unsigned int LootTableIndex; //!< The Loot Table Index uint32_t LootTableIndex; //!< The Loot Table Index
bool MissionDrop; //!< Whether or not this loot table is a mission drop bool MissionDrop; //!< Whether or not this loot table is a mission drop
unsigned int sortPriority; //!< The sorting priority uint32_t sortPriority; //!< The sorting priority
}; };
typedef uint32_t LootTableIndex; typedef uint32_t LootTableIndex;

2
dDatabase/CDClientDatabase/CDClientTables/CDMissionEmailTable.cpp
View File

@ -3,7 +3,7 @@
void CDMissionEmailTable::LoadValuesFromDatabase() { void CDMissionEmailTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM MissionEmail"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM MissionEmail");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

12
dDatabase/CDClientDatabase/CDClientTables/CDMissionEmailTable.h
View File

@ -4,13 +4,13 @@
#include "CDTable.h" #include "CDTable.h"
struct CDMissionEmail { struct CDMissionEmail {
unsigned int ID; uint32_t ID;
unsigned int messageType; uint32_t messageType;
unsigned int notificationGroup; uint32_t notificationGroup;
unsigned int missionID; uint32_t missionID;
unsigned int attachmentLOT; uint32_t attachmentLOT;
bool localize; bool localize;
unsigned int locStatus; uint32_t locStatus;
std::string gate_version; std::string gate_version;
}; };

2
dDatabase/CDClientDatabase/CDClientTables/CDMissionNPCComponentTable.cpp
View File

@ -3,7 +3,7 @@
void CDMissionNPCComponentTable::LoadValuesFromDatabase() { void CDMissionNPCComponentTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM MissionNPCComponent"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM MissionNPCComponent");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

4
dDatabase/CDClientDatabase/CDClientTables/CDMissionNPCComponentTable.h
View File

@ -4,8 +4,8 @@
#include "CDTable.h" #include "CDTable.h"
struct CDMissionNPCComponent { struct CDMissionNPCComponent {
unsigned int id; //!< The ID uint32_t id; //!< The ID
unsigned int missionID; //!< The Mission ID uint32_t missionID; //!< The Mission ID
bool offersMission; //!< Whether or not this NPC offers a mission bool offersMission; //!< Whether or not this NPC offers a mission
bool acceptsMission; //!< Whether or not this NPC accepts a mission bool acceptsMission; //!< Whether or not this NPC accepts a mission
std::string gate_version; //!< The gate version std::string gate_version; //!< The gate version

2
dDatabase/CDClientDatabase/CDClientTables/CDMissionTasksTable.cpp
View File

@ -3,7 +3,7 @@
void CDMissionTasksTable::LoadValuesFromDatabase() { void CDMissionTasksTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM MissionTasks"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM MissionTasks");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

16
dDatabase/CDClientDatabase/CDClientTables/CDMissionTasksTable.h
View File

@ -4,17 +4,17 @@
#include "CDTable.h" #include "CDTable.h"
struct CDMissionTasks { struct CDMissionTasks {
unsigned int id; //!< The Mission ID that the task belongs to uint32_t id; //!< The Mission ID that the task belongs to
UNUSED(unsigned int locStatus); //!< ??? UNUSED(uint32_t locStatus); //!< ???
unsigned int taskType; //!< The task type uint32_t taskType; //!< The task type
unsigned int target; //!< The mission target uint32_t target; //!< The mission target
std::string targetGroup; //!< The mission target group std::string targetGroup; //!< The mission target group
int targetValue; //!< The target value int32_t targetValue; //!< The target value
std::string taskParam1; //!< The task param 1 std::string taskParam1; //!< The task param 1
UNUSED(std::string largeTaskIcon); //!< ??? UNUSED(std::string largeTaskIcon); //!< ???
UNUSED(unsigned int IconID); //!< ??? UNUSED(uint32_t IconID); //!< ???
unsigned int uid; //!< ??? uint32_t uid; //!< ???
UNUSED(unsigned int largeTaskIconID); //!< ??? UNUSED(uint32_t largeTaskIconID); //!< ???
UNUSED(bool localize); //!< Whether or not the task should be localized UNUSED(bool localize); //!< Whether or not the task should be localized
UNUSED(std::string gate_version); //!< ??? UNUSED(std::string gate_version); //!< ???
}; };

2
dDatabase/CDClientDatabase/CDClientTables/CDMissionsTable.cpp
View File

@ -5,7 +5,7 @@ CDMissions CDMissionsTable::Default = {};
void CDMissionsTable::LoadValuesFromDatabase() { void CDMissionsTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM Missions"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM Missions");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

72
dDatabase/CDClientDatabase/CDClientTables/CDMissionsTable.h
View File

@ -6,58 +6,58 @@
#include <cstdint> #include <cstdint>
struct CDMissions { struct CDMissions {
int id; //!< The Mission ID int32_t id; //!< The Mission ID
std::string defined_type; //!< The type of mission std::string defined_type; //!< The type of mission
std::string defined_subtype; //!< The subtype of the mission std::string defined_subtype; //!< The subtype of the mission
int UISortOrder; //!< The UI Sort Order for the mission int32_t UISortOrder; //!< The UI Sort Order for the mission
int offer_objectID; //!< The LOT of the mission giver int32_t offer_objectID; //!< The LOT of the mission giver
int target_objectID; //!< The LOT of the mission's target int32_t target_objectID; //!< The LOT of the mission's target
int64_t reward_currency; //!< The amount of currency to reward the player int64_t reward_currency; //!< The amount of currency to reward the player
int LegoScore; //!< The amount of LEGO Score to reward the player int32_t LegoScore; //!< The amount of LEGO Score to reward the player
int64_t reward_reputation; //!< The reputation to award the player int64_t reward_reputation; //!< The reputation to award the player
bool isChoiceReward; //!< Whether or not the user has the option to choose their loot bool isChoiceReward; //!< Whether or not the user has the option to choose their loot
int reward_item1; //!< The first rewarded item int32_t reward_item1; //!< The first rewarded item
int reward_item1_count; //!< The count of the first item to be rewarded int32_t reward_item1_count; //!< The count of the first item to be rewarded
int reward_item2; //!< The second rewarded item int32_t reward_item2; //!< The second rewarded item
int reward_item2_count; //!< The count of the second item to be rewarded int32_t reward_item2_count; //!< The count of the second item to be rewarded
int reward_item3; //!< The third rewarded item int32_t reward_item3; //!< The third rewarded item
int reward_item3_count; //!< The count of the third item to be rewarded int32_t reward_item3_count; //!< The count of the third item to be rewarded
int reward_item4; //!< The fourth rewarded item int32_t reward_item4; //!< The fourth rewarded item
int reward_item4_count; //!< The count of the fourth item to be rewarded int32_t reward_item4_count; //!< The count of the fourth item to be rewarded
int reward_emote; //!< The first emote to be rewarded int32_t reward_emote; //!< The first emote to be rewarded
int reward_emote2; //!< The second emote to be rewarded int32_t reward_emote2; //!< The second emote to be rewarded
int reward_emote3; //!< The third emote to be rewarded int32_t reward_emote3; //!< The third emote to be rewarded
int reward_emote4; //!< The fourth emote to be rewarded int32_t reward_emote4; //!< The fourth emote to be rewarded
int reward_maximagination; //!< The amount of max imagination to reward int32_t reward_maximagination; //!< The amount of max imagination to reward
int reward_maxhealth; //!< The amount of max health to reward int32_t reward_maxhealth; //!< The amount of max health to reward
int reward_maxinventory; //!< The amount of max inventory to reward int32_t reward_maxinventory; //!< The amount of max inventory to reward
int reward_maxmodel; //!< ??? int32_t reward_maxmodel; //!< ???
int reward_maxwidget; //!< ??? int32_t reward_maxwidget; //!< ???
int reward_maxwallet; //!< ??? int32_t reward_maxwallet; //!< ???
bool repeatable; //!< Whether or not this mission can be repeated (for instance, is it a daily mission) bool repeatable; //!< Whether or not this mission can be repeated (for instance, is it a daily mission)
int64_t reward_currency_repeatable; //!< The repeatable reward int64_t reward_currency_repeatable; //!< The repeatable reward
int reward_item1_repeatable; //!< The first rewarded item int32_t reward_item1_repeatable; //!< The first rewarded item
int reward_item1_repeat_count; //!< The count of the first item to be rewarded int32_t reward_item1_repeat_count; //!< The count of the first item to be rewarded
int reward_item2_repeatable; //!< The second rewarded item int32_t reward_item2_repeatable; //!< The second rewarded item
int reward_item2_repeat_count; //!< The count of the second item to be rewarded int32_t reward_item2_repeat_count; //!< The count of the second item to be rewarded
int reward_item3_repeatable; //!< The third rewarded item int32_t reward_item3_repeatable; //!< The third rewarded item
int reward_item3_repeat_count; //!< The count of the third item to be rewarded int32_t reward_item3_repeat_count; //!< The count of the third item to be rewarded
int reward_item4_repeatable; //!< The fourth rewarded item int32_t reward_item4_repeatable; //!< The fourth rewarded item
int reward_item4_repeat_count; //!< The count of the fourth item to be rewarded int32_t reward_item4_repeat_count; //!< The count of the fourth item to be rewarded
int time_limit; //!< The time limit of the mission int32_t time_limit; //!< The time limit of the mission
bool isMission; //!< Maybe to differentiate between missions and achievements? bool isMission; //!< Maybe to differentiate between missions and achievements?
int missionIconID; //!< The mission icon ID int32_t missionIconID; //!< The mission icon ID
std::string prereqMissionID; //!< A '|' seperated list of prerequisite missions std::string prereqMissionID; //!< A '|' seperated list of prerequisite missions
bool localize; //!< Whether or not to localize the mission bool localize; //!< Whether or not to localize the mission
bool inMOTD; //!< In Match of the Day(?) bool inMOTD; //!< In Match of the Day(?)
int64_t cooldownTime; //!< The mission cooldown time int64_t cooldownTime; //!< The mission cooldown time
bool isRandom; //!< ??? bool isRandom; //!< ???
std::string randomPool; //!< ??? std::string randomPool; //!< ???
int UIPrereqID; //!< ??? int32_t UIPrereqID; //!< ???
UNUSED(std::string gate_version); //!< The gate version UNUSED(std::string gate_version); //!< The gate version
UNUSED(std::string HUDStates); //!< ??? UNUSED(std::string HUDStates); //!< ???
UNUSED(int locStatus); //!< ??? UNUSED(int32_t locStatus); //!< ???
int reward_bankinventory; //!< The amount of bank space this mission rewards int32_t reward_bankinventory; //!< The amount of bank space this mission rewards
}; };
class CDMissionsTable : public CDTable<CDMissionsTable> { class CDMissionsTable : public CDTable<CDMissionsTable> {

2
dDatabase/CDClientDatabase/CDClientTables/CDMovementAIComponentTable.cpp
View File

@ -3,7 +3,7 @@
void CDMovementAIComponentTable::LoadValuesFromDatabase() { void CDMovementAIComponentTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM MovementAIComponent"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM MovementAIComponent");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

2
dDatabase/CDClientDatabase/CDClientTables/CDMovementAIComponentTable.h
View File

@ -4,7 +4,7 @@
#include "CDTable.h" #include "CDTable.h"
struct CDMovementAIComponent { struct CDMovementAIComponent {
unsigned int id; uint32_t id;
std::string MovementType; std::string MovementType;
float WanderChance; float WanderChance;
float WanderDelayMin; float WanderDelayMin;

2
dDatabase/CDClientDatabase/CDClientTables/CDObjectSkillsTable.cpp
View File

@ -3,7 +3,7 @@
void CDObjectSkillsTable::LoadValuesFromDatabase() { void CDObjectSkillsTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ObjectSkills"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ObjectSkills");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

8
dDatabase/CDClientDatabase/CDClientTables/CDObjectSkillsTable.h
View File

@ -4,10 +4,10 @@
#include "CDTable.h" #include "CDTable.h"
struct CDObjectSkills { struct CDObjectSkills {
unsigned int objectTemplate; //!< The LOT of the item uint32_t objectTemplate; //!< The LOT of the item
unsigned int skillID; //!< The Skill ID of the object uint32_t skillID; //!< The Skill ID of the object
unsigned int castOnType; //!< ??? uint32_t castOnType; //!< ???
unsigned int AICombatWeight; //!< ??? uint32_t AICombatWeight; //!< ???
}; };
class CDObjectSkillsTable : public CDTable<CDObjectSkillsTable> { class CDObjectSkillsTable : public CDTable<CDObjectSkillsTable> {

4
dDatabase/CDClientDatabase/CDClientTables/CDObjectsTable.cpp
View File

@ -2,7 +2,7 @@
void CDObjectsTable::LoadValuesFromDatabase() { void CDObjectsTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM Objects"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM Objects");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);
@ -40,7 +40,7 @@ void CDObjectsTable::LoadValuesFromDatabase() {
m_default.id = 0; m_default.id = 0;
} }
const CDObjects& CDObjectsTable::GetByID(unsigned int LOT) { const CDObjects& CDObjectsTable::GetByID(uint32_t LOT) {
const auto& it = this->entries.find(LOT); const auto& it = this->entries.find(LOT);
if (it != this->entries.end()) { if (it != this->entries.end()) {
return it->second; return it->second;

18
dDatabase/CDClientDatabase/CDClientTables/CDObjectsTable.h
View File

@ -4,30 +4,30 @@
#include "CDTable.h" #include "CDTable.h"
struct CDObjects { struct CDObjects {
unsigned int id; //!< The LOT of the object uint32_t id; //!< The LOT of the object
std::string name; //!< The internal name of the object std::string name; //!< The internal name of the object
UNUSED(unsigned int placeable); //!< Whether or not the object is placable UNUSED(uint32_t placeable); //!< Whether or not the object is placable
std::string type; //!< The object type std::string type; //!< The object type
UNUSED(std::string description); //!< An internal description of the object UNUSED(std::string description); //!< An internal description of the object
UNUSED(unsigned int localize); //!< Whether or not the object should localize UNUSED(uint32_t localize); //!< Whether or not the object should localize
UNUSED(unsigned int npcTemplateID); //!< Something related to NPCs... UNUSED(uint32_t npcTemplateID); //!< Something related to NPCs...
UNUSED(std::string displayName); //!< The display name of the object UNUSED(std::string displayName); //!< The display name of the object
float interactionDistance; //!< The interaction distance of the object float interactionDistance; //!< The interaction distance of the object
UNUSED(unsigned int nametag); //!< ??? UNUSED(uint32_t nametag); //!< ???
UNUSED(std::string _internalNotes); //!< Some internal notes (rarely used) UNUSED(std::string _internalNotes); //!< Some internal notes (rarely used)
UNUSED(unsigned int locStatus); //!< ??? UNUSED(uint32_t locStatus); //!< ???
UNUSED(std::string gate_version); //!< The gate version for the object UNUSED(std::string gate_version); //!< The gate version for the object
UNUSED(unsigned int HQ_valid); //!< Probably used for the Nexus HQ database on LEGOUniverse.com UNUSED(uint32_t HQ_valid); //!< Probably used for the Nexus HQ database on LEGOUniverse.com
}; };
class CDObjectsTable : public CDTable<CDObjectsTable> { class CDObjectsTable : public CDTable<CDObjectsTable> {
private: private:
std::map<unsigned int, CDObjects> entries; std::map<uint32_t, CDObjects> entries;
CDObjects m_default; CDObjects m_default;
public: public:
void LoadValuesFromDatabase(); void LoadValuesFromDatabase();
// Gets an entry by ID // Gets an entry by ID
const CDObjects& GetByID(unsigned int LOT); const CDObjects& GetByID(uint32_t LOT);
}; };

2
dDatabase/CDClientDatabase/CDClientTables/CDPackageComponentTable.cpp
View File

@ -3,7 +3,7 @@
void CDPackageComponentTable::LoadValuesFromDatabase() { void CDPackageComponentTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM PackageComponent"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM PackageComponent");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

6
dDatabase/CDClientDatabase/CDClientTables/CDPackageComponentTable.h
View File

@ -4,9 +4,9 @@
#include "CDTable.h" #include "CDTable.h"
struct CDPackageComponent { struct CDPackageComponent {
unsigned int id; uint32_t id;
unsigned int LootMatrixIndex; uint32_t LootMatrixIndex;
unsigned int packageType; uint32_t packageType;
}; };
class CDPackageComponentTable : public CDTable<CDPackageComponentTable> { class CDPackageComponentTable : public CDTable<CDPackageComponentTable> {

2
dDatabase/CDClientDatabase/CDClientTables/CDPhysicsComponentTable.cpp
View File

@ -28,7 +28,7 @@ void CDPhysicsComponentTable::LoadValuesFromDatabase() {
tableData.finalize(); tableData.finalize();
} }
CDPhysicsComponent* CDPhysicsComponentTable::GetByID(unsigned int componentID) { CDPhysicsComponent* CDPhysicsComponentTable::GetByID(uint32_t componentID) {
auto itr = m_entries.find(componentID); auto itr = m_entries.find(componentID);
return itr != m_entries.end() ? &itr->second : nullptr; return itr != m_entries.end() ? &itr->second : nullptr;
} }

10
dDatabase/CDClientDatabase/CDClientTables/CDPhysicsComponentTable.h
View File

@ -3,7 +3,7 @@
#include <string> #include <string>
struct CDPhysicsComponent { struct CDPhysicsComponent {
int id; int32_t id;
bool bStatic; bool bStatic;
std::string physicsAsset; std::string physicsAsset;
UNUSED(bool jump); UNUSED(bool jump);
@ -12,8 +12,8 @@ struct CDPhysicsComponent {
UNUSED(float rotSpeed); UNUSED(float rotSpeed);
float playerHeight; float playerHeight;
float playerRadius; float playerRadius;
int pcShapeType; int32_t pcShapeType;
int collisionGroup; int32_t collisionGroup;
UNUSED(float airSpeed); UNUSED(float airSpeed);
UNUSED(std::string boundaryAsset); UNUSED(std::string boundaryAsset);
UNUSED(float jumpAirSpeed); UNUSED(float jumpAirSpeed);
@ -26,8 +26,8 @@ public:
void LoadValuesFromDatabase(); void LoadValuesFromDatabase();
static const std::string GetTableName() { return "PhysicsComponent"; }; static const std::string GetTableName() { return "PhysicsComponent"; };
CDPhysicsComponent* GetByID(unsigned int componentID); CDPhysicsComponent* GetByID(uint32_t componentID);
private: private:
std::map<unsigned int, CDPhysicsComponent> m_entries; std::map<uint32_t, CDPhysicsComponent> m_entries;
}; };

2
dDatabase/CDClientDatabase/CDClientTables/CDProximityMonitorComponentTable.cpp
View File

@ -3,7 +3,7 @@
void CDProximityMonitorComponentTable::LoadValuesFromDatabase() { void CDProximityMonitorComponentTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ProximityMonitorComponent"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ProximityMonitorComponent");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

2
dDatabase/CDClientDatabase/CDClientTables/CDProximityMonitorComponentTable.h
View File

@ -4,7 +4,7 @@
#include "CDTable.h" #include "CDTable.h"
struct CDProximityMonitorComponent { struct CDProximityMonitorComponent {
unsigned int id; uint32_t id;
std::string Proximities; std::string Proximities;
bool LoadOnClient; bool LoadOnClient;
bool LoadOnServer; bool LoadOnServer;

2
dDatabase/CDClientDatabase/CDClientTables/CDRarityTableTable.cpp
View File

@ -3,7 +3,7 @@
void CDRarityTableTable::LoadValuesFromDatabase() { void CDRarityTableTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM RarityTable"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM RarityTable");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

2
dDatabase/CDClientDatabase/CDClientTables/CDRarityTableTable.h
View File

@ -5,7 +5,7 @@
struct CDRarityTable { struct CDRarityTable {
float randmax; float randmax;
unsigned int rarity; uint32_t rarity;
}; };
typedef std::vector<CDRarityTable> RarityTable; typedef std::vector<CDRarityTable> RarityTable;

2
dDatabase/CDClientDatabase/CDClientTables/CDRebuildComponentTable.cpp
View File

@ -3,7 +3,7 @@
void CDRebuildComponentTable::LoadValuesFromDatabase() { void CDRebuildComponentTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM RebuildComponent"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM RebuildComponent");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

8
dDatabase/CDClientDatabase/CDClientTables/CDRebuildComponentTable.h
View File

@ -4,15 +4,15 @@
#include "CDTable.h" #include "CDTable.h"
struct CDRebuildComponent { struct CDRebuildComponent {
unsigned int id; //!< The component Id uint32_t id; //!< The component Id
float reset_time; //!< The reset time float reset_time; //!< The reset time
float complete_time; //!< The complete time float complete_time; //!< The complete time
unsigned int take_imagination; //!< The amount of imagination it costs uint32_t take_imagination; //!< The amount of imagination it costs
bool interruptible; //!< Whether or not the rebuild is interruptible bool interruptible; //!< Whether or not the rebuild is interruptible
bool self_activator; //!< Whether or not the rebuild is a rebuild activator itself bool self_activator; //!< Whether or not the rebuild is a rebuild activator itself
std::string custom_modules; //!< The custom modules std::string custom_modules; //!< The custom modules
unsigned int activityID; //!< The activity ID uint32_t activityID; //!< The activity ID
unsigned int post_imagination_cost; //!< The post imagination cost uint32_t post_imagination_cost; //!< The post imagination cost
float time_before_smash; //!< The time before smash float time_before_smash; //!< The time before smash
}; };

2
dDatabase/CDClientDatabase/CDClientTables/CDRewardCodesTable.cpp
View File

@ -3,7 +3,7 @@
void CDRewardCodesTable::LoadValuesFromDatabase() { void CDRewardCodesTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM RewardCodes"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM RewardCodes");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

6
dDatabase/CDClientDatabase/CDClientTables/CDScriptComponentTable.cpp
View File

@ -3,7 +3,7 @@
void CDScriptComponentTable::LoadValuesFromDatabase() { void CDScriptComponentTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ScriptComponent"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ScriptComponent");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);
@ -28,8 +28,8 @@ void CDScriptComponentTable::LoadValuesFromDatabase() {
tableData.finalize(); tableData.finalize();
} }
const CDScriptComponent& CDScriptComponentTable::GetByID(unsigned int id) { const CDScriptComponent& CDScriptComponentTable::GetByID(uint32_t id) {
std::map<unsigned int, CDScriptComponent>::iterator it = this->entries.find(id); std::map<uint32_t, CDScriptComponent>::iterator it = this->entries.find(id);
if (it != this->entries.end()) { if (it != this->entries.end()) {
return it->second; return it->second;
} }

6
dDatabase/CDClientDatabase/CDClientTables/CDScriptComponentTable.h
View File

@ -4,19 +4,19 @@
#include "CDTable.h" #include "CDTable.h"
struct CDScriptComponent { struct CDScriptComponent {
unsigned int id; //!< The component ID uint32_t id; //!< The component ID
std::string script_name; //!< The script name std::string script_name; //!< The script name
std::string client_script_name; //!< The client script name std::string client_script_name; //!< The client script name
}; };
class CDScriptComponentTable : public CDTable<CDScriptComponentTable> { class CDScriptComponentTable : public CDTable<CDScriptComponentTable> {
private: private:
std::map<unsigned int, CDScriptComponent> entries; std::map<uint32_t, CDScriptComponent> entries;
CDScriptComponent m_ToReturnWhenNoneFound; CDScriptComponent m_ToReturnWhenNoneFound;
public: public:
void LoadValuesFromDatabase(); void LoadValuesFromDatabase();
// Gets an entry by scriptID // Gets an entry by scriptID
const CDScriptComponent& GetByID(unsigned int id); const CDScriptComponent& GetByID(uint32_t id);
}; };

6
dDatabase/CDClientDatabase/CDClientTables/CDSkillBehaviorTable.cpp
View File

@ -4,7 +4,7 @@ void CDSkillBehaviorTable::LoadValuesFromDatabase() {
m_empty = CDSkillBehavior(); m_empty = CDSkillBehavior();
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM SkillBehavior"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM SkillBehavior");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);
@ -49,8 +49,8 @@ void CDSkillBehaviorTable::LoadValuesFromDatabase() {
tableData.finalize(); tableData.finalize();
} }
const CDSkillBehavior& CDSkillBehaviorTable::GetSkillByID(unsigned int skillID) { const CDSkillBehavior& CDSkillBehaviorTable::GetSkillByID(uint32_t skillID) {
std::map<unsigned int, CDSkillBehavior>::iterator it = this->entries.find(skillID); std::map<uint32_t, CDSkillBehavior>::iterator it = this->entries.find(skillID);
if (it != this->entries.end()) { if (it != this->entries.end()) {
return it->second; return it->second;
} }

30
dDatabase/CDClientDatabase/CDClientTables/CDSkillBehaviorTable.h
View File

@ -4,36 +4,36 @@
#include "CDTable.h" #include "CDTable.h"
struct CDSkillBehavior { struct CDSkillBehavior {
unsigned int skillID; //!< The Skill ID of the skill uint32_t skillID; //!< The Skill ID of the skill
UNUSED(unsigned int locStatus); //!< ?? UNUSED(uint32_t locStatus); //!< ??
unsigned int behaviorID; //!< The Behavior ID of the skill uint32_t behaviorID; //!< The Behavior ID of the skill
unsigned int imaginationcost; //!< The imagination cost of the skill uint32_t imaginationcost; //!< The imagination cost of the skill
unsigned int cooldowngroup; //!< The cooldown group ID of the skill uint32_t cooldowngroup; //!< The cooldown group ID of the skill
float cooldown; //!< The cooldown time of the skill float cooldown; //!< The cooldown time of the skill
UNUSED(bool isNpcEditor); //!< ??? UNUSED(bool isNpcEditor); //!< ???
UNUSED(unsigned int skillIcon); //!< The Skill Icon ID UNUSED(uint32_t skillIcon); //!< The Skill Icon ID
UNUSED(std::string oomSkillID); //!< ??? UNUSED(std::string oomSkillID); //!< ???
UNUSED(unsigned int oomBehaviorEffectID); //!< ??? UNUSED(uint32_t oomBehaviorEffectID); //!< ???
UNUSED(unsigned int castTypeDesc); //!< The cast type description(?) UNUSED(uint32_t castTypeDesc); //!< The cast type description(?)
UNUSED(unsigned int imBonusUI); //!< The imagination bonus of the skill UNUSED(uint32_t imBonusUI); //!< The imagination bonus of the skill
UNUSED(nsigned int lifeBonusUI); //!< The life bonus of the skill UNUSED(nint32_t lifeBonusUI); //!< The life bonus of the skill
UNUSED(unsigned int armorBonusUI); //!< The armor bonus of the skill UNUSED(uint32_t armorBonusUI); //!< The armor bonus of the skill
UNUSED(unsigned int damageUI); //!< ??? UNUSED(uint32_t damageUI); //!< ???
UNUSED(bool hideIcon); //!< Whether or not to show the icon UNUSED(bool hideIcon); //!< Whether or not to show the icon
UNUSED(bool localize); //!< ??? UNUSED(bool localize); //!< ???
UNUSED(std::string gate_version); //!< ??? UNUSED(std::string gate_version); //!< ???
UNUSED(unsigned int cancelType); //!< The cancel type (?) UNUSED(uint32_t cancelType); //!< The cancel type (?)
}; };
class CDSkillBehaviorTable : public CDTable<CDSkillBehaviorTable> { class CDSkillBehaviorTable : public CDTable<CDSkillBehaviorTable> {
private: private:
std::map<unsigned int, CDSkillBehavior> entries; std::map<uint32_t, CDSkillBehavior> entries;
CDSkillBehavior m_empty; CDSkillBehavior m_empty;
public: public:
void LoadValuesFromDatabase(); void LoadValuesFromDatabase();
// Gets an entry by skillID // Gets an entry by skillID
const CDSkillBehavior& GetSkillByID(unsigned int skillID); const CDSkillBehavior& GetSkillByID(uint32_t skillID);
}; };

2
dDatabase/CDClientDatabase/CDClientTables/CDVendorComponentTable.cpp
View File

@ -3,7 +3,7 @@
void CDVendorComponentTable::LoadValuesFromDatabase() { void CDVendorComponentTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM VendorComponent"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM VendorComponent");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);

4
dDatabase/CDClientDatabase/CDClientTables/CDVendorComponentTable.h
View File

@ -4,11 +4,11 @@
#include "CDTable.h" #include "CDTable.h"
struct CDVendorComponent { struct CDVendorComponent {
unsigned int id; //!< The Component ID uint32_t id; //!< The Component ID
float buyScalar; //!< Buy Scalar (what does that mean?) float buyScalar; //!< Buy Scalar (what does that mean?)
float sellScalar; //!< Sell Scalar (what does that mean?) float sellScalar; //!< Sell Scalar (what does that mean?)
float refreshTimeSeconds; //!< The refresh time float refreshTimeSeconds; //!< The refresh time
unsigned int LootMatrixIndex; //!< LootMatrixIndex of the vendor's items uint32_t LootMatrixIndex; //!< LootMatrixIndex of the vendor's items
}; };
class CDVendorComponentTable : public CDTable<CDVendorComponentTable> { class CDVendorComponentTable : public CDTable<CDVendorComponentTable> {

4
dDatabase/CDClientDatabase/CDClientTables/CDZoneTableTable.cpp
View File

@ -3,7 +3,7 @@
void CDZoneTableTable::LoadValuesFromDatabase() { void CDZoneTableTable::LoadValuesFromDatabase() {
// First, get the size of the table // First, get the size of the table
unsigned int size = 0; uint32_t size = 0;
auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ZoneTable"); auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM ZoneTable");
while (!tableSize.eof()) { while (!tableSize.eof()) {
size = tableSize.getIntField(0, 0); size = tableSize.getIntField(0, 0);
@ -53,7 +53,7 @@ void CDZoneTableTable::LoadValuesFromDatabase() {
} }
//! Queries the table with a zoneID to find. //! Queries the table with a zoneID to find.
const CDZoneTable* CDZoneTableTable::Query(unsigned int zoneID) { const CDZoneTable* CDZoneTableTable::Query(uint32_t zoneID) {
const auto& iter = m_Entries.find(zoneID); const auto& iter = m_Entries.find(zoneID);
if (iter != m_Entries.end()) { if (iter != m_Entries.end()) {

20
dDatabase/CDClientDatabase/CDClientTables/CDZoneTableTable.h
View File

@ -4,14 +4,14 @@
#include "CDTable.h" #include "CDTable.h"
struct CDZoneTable { struct CDZoneTable {
unsigned int zoneID; //!< The Zone ID of the object uint32_t zoneID; //!< The Zone ID of the object
unsigned int locStatus; //!< The Locale Status(?) uint32_t locStatus; //!< The Locale Status(?)
std::string zoneName; //!< The name of the zone std::string zoneName; //!< The name of the zone
unsigned int scriptID; //!< The Script ID of the zone (ScriptsTable) uint32_t scriptID; //!< The Script ID of the zone (ScriptsTable)
float ghostdistance_min; //!< The minimum ghosting distance float ghostdistance_min; //!< The minimum ghosting distance
float ghostdistance; //!< The ghosting distance float ghostdistance; //!< The ghosting distance
unsigned int population_soft_cap; //!< The "soft cap" on the world population uint32_t population_soft_cap; //!< The "soft cap" on the world population
unsigned int population_hard_cap; //!< The "hard cap" on the world population uint32_t population_hard_cap; //!< The "hard cap" on the world population
UNUSED(std::string DisplayDescription); //!< The display description of the world UNUSED(std::string DisplayDescription); //!< The display description of the world
UNUSED(std::string mapFolder); //!< ??? UNUSED(std::string mapFolder); //!< ???
float smashableMinDistance; //!< The minimum smashable distance? float smashableMinDistance; //!< The minimum smashable distance?
@ -19,9 +19,9 @@ struct CDZoneTable {
UNUSED(std::string mixerProgram); //!< ??? UNUSED(std::string mixerProgram); //!< ???
UNUSED(std::string clientPhysicsFramerate); //!< The client physics framerate UNUSED(std::string clientPhysicsFramerate); //!< The client physics framerate
std::string serverPhysicsFramerate; //!< The server physics framerate std::string serverPhysicsFramerate; //!< The server physics framerate
unsigned int zoneControlTemplate; //!< The Zone Control template uint32_t zoneControlTemplate; //!< The Zone Control template
unsigned int widthInChunks; //!< The width of the world in chunks uint32_t widthInChunks; //!< The width of the world in chunks
unsigned int heightInChunks; //!< The height of the world in chunks uint32_t heightInChunks; //!< The height of the world in chunks
bool petsAllowed; //!< Whether or not pets are allowed in the world bool petsAllowed; //!< Whether or not pets are allowed in the world
bool localize; //!< Whether or not the world should be localized bool localize; //!< Whether or not the world should be localized
float fZoneWeight; //!< ??? float fZoneWeight; //!< ???
@ -35,11 +35,11 @@ struct CDZoneTable {
class CDZoneTableTable : public CDTable<CDZoneTableTable> { class CDZoneTableTable : public CDTable<CDZoneTableTable> {
private: private:
std::map<unsigned int, CDZoneTable> m_Entries; std::map<uint32_t, CDZoneTable> m_Entries;
public: public:
void LoadValuesFromDatabase(); void LoadValuesFromDatabase();
// Queries the table with a zoneID to find. // Queries the table with a zoneID to find.
const CDZoneTable* Query(unsigned int zoneID); const CDZoneTable* Query(uint32_t zoneID);
}; };