diff --git a/dDatabase/Tables/CDBehaviorParameterTable.cpp b/dDatabase/Tables/CDBehaviorParameterTable.cpp index 3087ba6d..6044a858 100644 --- a/dDatabase/Tables/CDBehaviorParameterTable.cpp +++ b/dDatabase/Tables/CDBehaviorParameterTable.cpp @@ -4,19 +4,19 @@ //! Constructor CDBehaviorParameterTable::CDBehaviorParameterTable(void) { #ifdef CDCLIENT_CACHE_ALL - auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM BehaviorParameter"); - while (!tableData.eof()) { - CDBehaviorParameter entry; - entry.behaviorID = tableData.getIntField(0, -1); - entry.parameterID = tableData.getStringField(1, ""); - entry.value = tableData.getFloatField(2, -1.0f); + auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM BehaviorParameter"); + while (!tableData.eof()) { + CDBehaviorParameter entry; + entry.behaviorID = tableData.getIntField(0, -1); + entry.parameterID = tableData.getStringField(1, ""); + entry.value = tableData.getFloatField(2, -1.0f); //Check if we have an entry with this ID: auto it = m_entries.find(entry.behaviorID); if (it != m_entries.end()) { it->second.insert(std::make_pair(entry.parameterID, entry.value)); } - else { + else { //Otherwise, insert it: m_entries.insert(std::make_pair(entry.behaviorID, std::map())); auto jit = m_entries.find(entry.behaviorID); @@ -25,8 +25,8 @@ CDBehaviorParameterTable::CDBehaviorParameterTable(void) { jit->second.insert(std::make_pair(entry.parameterID, entry.value)); } - tableData.nextRow(); - } + tableData.nextRow(); + } tableData.finalize(); #endif @@ -37,10 +37,10 @@ CDBehaviorParameterTable::~CDBehaviorParameterTable(void) { } //! Returns the table's name std::string CDBehaviorParameterTable::GetName(void) const { - return "BehaviorParameter"; + return "BehaviorParameter"; } -float CDBehaviorParameterTable::GetEntry(const uint32_t behaviorID, const std::string& name) +float CDBehaviorParameterTable::GetEntry(const uint32_t behaviorID, const std::string& name) { size_t hash = 0; GeneralUtils::hash_combine(hash, behaviorID); @@ -60,16 +60,16 @@ float CDBehaviorParameterTable::GetEntry(const uint32_t behaviorID, const std::s #ifndef CDCLIENT_CACHE_ALL auto query = CDClientDatabase::CreatePreppedStmt( - "SELECT parameterID, value FROM BehaviorParameter WHERE behaviorID = ?;"); - query.bind(1, (int) behaviorID); + "SELECT parameterID, value FROM BehaviorParameter WHERE behaviorID = ?;"); + query.bind(1, (int) behaviorID); auto tableData = query.execQuery(); m_Entries.insert_or_assign(behaviorID, 0); - + while (!tableData.eof()) { - const std::string parameterID = tableData.getStringField(0, ""); - const float value = tableData.getFloatField(1, 0); + const std::string parameterID = tableData.getStringField(0, ""); + const float value = tableData.getFloatField(1, 0); size_t parameterHash = 0; GeneralUtils::hash_combine(parameterHash, behaviorID); @@ -77,8 +77,8 @@ float CDBehaviorParameterTable::GetEntry(const uint32_t behaviorID, const std::s m_Entries.insert_or_assign(parameterHash, value); - tableData.nextRow(); - } + tableData.nextRow(); + } const auto& it2 = m_Entries.find(hash); if (it2 != m_Entries.end()) { diff --git a/dGame/dBehaviors/Behavior.cpp b/dGame/dBehaviors/Behavior.cpp index 351a4ada..1f666c05 100644 --- a/dGame/dBehaviors/Behavior.cpp +++ b/dGame/dBehaviors/Behavior.cpp @@ -276,11 +276,11 @@ Behavior* Behavior::CreateBehavior(const uint32_t behaviorId) } BehaviorTemplates Behavior::GetBehaviorTemplate(const uint32_t behaviorId) { - auto query = CDClientDatabase::CreatePreppedStmt( - "SELECT templateID FROM BehaviorTemplate WHERE behaviorID = ?;"); - query.bind(1, (int) behaviorId); + auto query = CDClientDatabase::CreatePreppedStmt( + "SELECT templateID FROM BehaviorTemplate WHERE behaviorID = ?;"); + query.bind(1, (int) behaviorId); - auto result = query.execQuery(); + auto result = query.execQuery(); // Make sure we do not proceed if we are trying to load an invalid behavior if (result.eof())