Merge e391f966bb into b69a992141

src/db/Db.cpp

@@ -12,7 +12,6 @@ WowClientDB<CharacterFacialHairStylesRec> g_characterFacialHairStylesDB;
 WowClientDB<ChrClassesRec> g_chrClassesDB;
 WowClientDB<ChrRacesRec> g_chrRacesDB;
 WowClientDB<CreatureDisplayInfoRec> g_creatureDisplayInfoDB;
-WowClientDB<CreatureDisplayInfoExtraRec> g_creatureDisplayInfoExtraDB;
 WowClientDB<CreatureModelDataRec> g_creatureModelDataDB;
 WowClientDB<FactionGroupRec> g_factionGroupDB;
 WowClientDB<FactionTemplateRec> g_factionTemplateDB;
@@ -39,7 +38,6 @@ void StaticDBLoadAll(void (*loadFn)(WowClientDB_Base*, const char*, int32_t)) {
     loadFn(&g_chrClassesDB, __FILE__, __LINE__);
     loadFn(&g_chrRacesDB, __FILE__, __LINE__);
     loadFn(&g_creatureDisplayInfoDB, __FILE__, __LINE__);
-    loadFn(&g_creatureDisplayInfoExtraDB, __FILE__, __LINE__);
     loadFn(&g_creatureModelDataDB, __FILE__, __LINE__);
     loadFn(&g_factionGroupDB, __FILE__, __LINE__);
     loadFn(&g_factionTemplateDB, __FILE__, __LINE__);

src/db/Db.hpp

@@ -13,7 +13,6 @@
 #include "db/rec/ChrClassesRec.hpp"
 #include "db/rec/ChrRacesRec.hpp"
 #include "db/rec/CreatureDisplayInfoRec.hpp"
-#include "db/rec/CreatureDisplayInfoExtraRec.hpp"
 #include "db/rec/CreatureModelDataRec.hpp"
 #include "db/rec/FactionGroupRec.hpp"
 #include "db/rec/FactionTemplateRec.hpp"
@@ -35,7 +34,6 @@ extern WowClientDB<CharacterFacialHairStylesRec> g_characterFacialHairStylesDB;
 extern WowClientDB<ChrClassesRec> g_chrClassesDB;
 extern WowClientDB<ChrRacesRec> g_chrRacesDB;
 extern WowClientDB<CreatureDisplayInfoRec> g_creatureDisplayInfoDB;
-extern WowClientDB<CreatureDisplayInfoExtraRec> g_creatureDisplayInfoExtraDB;
 extern WowClientDB<CreatureModelDataRec> g_creatureModelDataDB;
 extern WowClientDB<FactionGroupRec> g_factionGroupDB;
 extern WowClientDB<FactionTemplateRec> g_factionTemplateDB;

src/db/rec/CreatureDisplayInfoExtraRec.cpp

@@ -1,66 +0,0 @@
-// DO NOT EDIT: generated by whoa-autocode
-#include "db/rec/CreatureDisplayInfoExtraRec.hpp"
-#include "util/Locale.hpp"
-#include "util/SFile.hpp"
-
-const char* CreatureDisplayInfoExtraRec::GetFilename() {
-    return "DBFilesClient\\CreatureDisplayInfoExtra.dbc";
-}
-
-uint32_t CreatureDisplayInfoExtraRec::GetNumColumns() {
-    return 21;
-}
-
-uint32_t CreatureDisplayInfoExtraRec::GetRowSize() {
-    return 84;
-}
-
-bool CreatureDisplayInfoExtraRec::NeedIDAssigned() {
-    return false;
-}
-
-int32_t CreatureDisplayInfoExtraRec::GetID() {
-    return this->m_ID;
-}
-
-void CreatureDisplayInfoExtraRec::SetID(int32_t id) {
-    this->m_ID = id;
-}
-
-bool CreatureDisplayInfoExtraRec::Read(SFile* f, const char* stringBuffer) {
-    uint32_t bakeNameOfs;
-
-    if (
-        !SFile::Read(f, &this->m_ID, sizeof(this->m_ID), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_displayRaceID, sizeof(this->m_displayRaceID), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_displaySexID, sizeof(this->m_displaySexID), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_skinID, sizeof(this->m_skinID), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_faceID, sizeof(this->m_faceID), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_hairStyleID, sizeof(this->m_hairStyleID), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_hairColorID, sizeof(this->m_hairColorID), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_facialHairID, sizeof(this->m_facialHairID), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_npcitemDisplay[0], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_npcitemDisplay[1], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_npcitemDisplay[2], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_npcitemDisplay[3], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_npcitemDisplay[4], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_npcitemDisplay[5], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_npcitemDisplay[6], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_npcitemDisplay[7], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_npcitemDisplay[8], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_npcitemDisplay[9], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_npcitemDisplay[10], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &this->m_flags, sizeof(this->m_flags), nullptr, nullptr, nullptr)
-        || !SFile::Read(f, &bakeNameOfs, sizeof(uint32_t), nullptr, nullptr, nullptr)
-    ) {
-        return false;
-    }
-
-    if (stringBuffer) {
-        this->m_bakeName = &stringBuffer[bakeNameOfs];
-    } else {
-        this->m_bakeName = "";
-    }
-
-    return true;
-}

src/db/rec/CreatureDisplayInfoExtraRec.hpp

@@ -1,32 +0,0 @@
-// DO NOT EDIT: generated by whoa-autocode
-#ifndef DB_REC_CREATURE_DISPLAY_INFO_EXTRA_REC_HPP
-#define DB_REC_CREATURE_DISPLAY_INFO_EXTRA_REC_HPP
-
-#include <cstdint>
-
-class SFile;
-
-class CreatureDisplayInfoExtraRec {
-    public:
-        int32_t m_ID;
-        int32_t m_displayRaceID;
-        int32_t m_displaySexID;
-        int32_t m_skinID;
-        int32_t m_faceID;
-        int32_t m_hairStyleID;
-        int32_t m_hairColorID;
-        int32_t m_facialHairID;
-        int32_t m_npcitemDisplay[11];
-        int32_t m_flags;
-        const char* m_bakeName;
-
-        static const char* GetFilename();
-        static uint32_t GetNumColumns();
-        static uint32_t GetRowSize();
-        static bool NeedIDAssigned();
-        int32_t GetID();
-        void SetID(int32_t id);
-        bool Read(SFile* f, const char* stringBuffer);
-};
-
-#endif