sDBCChrClasses

src/game/Chat/Level3.cpp

@@ -1519,7 +1519,7 @@ bool ChatHandler::HandleLearnAllMyClassCommand(char* /*args*/)
 bool ChatHandler::HandleLearnAllMySpellsCommand(char* /*args*/)
 {
     Player* player = m_session->GetPlayer();
-    ChrClassesEntry const* clsEntry = sChrClassesStore.LookupEntry(player->getClass());
+    ChrClassesEntry const* clsEntry = sDBCChrClasses.LookupEntry(player->getClass());
     if (!clsEntry)
         return true;
     uint32 family = clsEntry->spellfamily;
@@ -4157,7 +4157,7 @@ bool ChatHandler::HandleResetHonorCommand(char* args)
 
 static bool HandleResetStatsOrLevelHelper(Player* player)
 {
-    ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(player->getClass());
+    ChrClassesEntry const* cEntry = sDBCChrClasses.LookupEntry(player->getClass());
     if (!cEntry)
     {
         sLog.outError("Class %u not found in DBC (Wrong DBC files?)", player->getClass());
@@ -5940,7 +5940,7 @@ bool ChatHandler::ShowPlayerListHelper(QueryResult* result, uint32* limit, bool
             uint32 level     = fields[4].GetUInt32();
 
             ChrRacesEntry const* raceEntry = sChrRacesStore.LookupEntry(race);
-            ChrClassesEntry const* classEntry = sChrClassesStore.LookupEntry(class_);
+            ChrClassesEntry const* classEntry = sDBCChrClasses.LookupEntry(class_);
 
             char const* race_name = raceEntry   ? raceEntry->name[GetSessionDbcLocale()] : "<?>";
             char const* class_name = classEntry ? classEntry->name[GetSessionDbcLocale()] : "<?>";

src/game/Entities/CharacterHandler.cpp

@@ -251,7 +251,7 @@ void WorldSession::HandleCharCreateOpcode(WorldPacket& recv_data)
         }
     }
 
-    ChrClassesEntry const* classEntry = sChrClassesStore.LookupEntry(class_);
+    ChrClassesEntry const* classEntry = sDBCChrClasses.LookupEntry(class_);
     ChrRacesEntry const* raceEntry = sChrRacesStore.LookupEntry(race_);
 
     if (!classEntry || !raceEntry)

src/game/Entities/Player.cpp

@@ -726,7 +726,7 @@ bool Player::Create(uint32 guidlow, const std::string& name, uint8 race, uint8 c
         return false;
     }
 
-    ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(class_);
+    ChrClassesEntry const* cEntry = sDBCChrClasses.LookupEntry(class_);
     if (!cEntry)
     {
         sLog.outError("Class %u not found in DBC (Wrong DBC files?)", class_);
@@ -18542,7 +18542,7 @@ void Player::InitDataForForm(bool reapplyMods)
         }
         default:                                            // 0, for example
         {
-            ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(getClass());
+            ChrClassesEntry const* cEntry = sDBCChrClasses.LookupEntry(getClass());
             if (cEntry && cEntry->powerType < MAX_POWERS && uint32(GetPowerType()) != cEntry->powerType)
                 SetPowerType(Powers(cEntry->powerType));
             break;

src/game/Globals/ObjectMgr.cpp

@@ -2729,7 +2729,7 @@ void ObjectMgr::LoadPlayerInfo()
                 continue;
             }
 
-            ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(current_class);
+            ChrClassesEntry const* cEntry = sDBCChrClasses.LookupEntry(current_class);
             if (!cEntry || !((1 << (current_class - 1)) & CLASSMASK_ALL_PLAYABLE))
             {
                 sLog.outErrorDb("Wrong class %u in `playercreateinfo` table, ignoring.", current_class);
@@ -2806,7 +2806,7 @@ void ObjectMgr::LoadPlayerInfo()
                     continue;
                 }
 
-                ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(current_class);
+                ChrClassesEntry const* cEntry = sDBCChrClasses.LookupEntry(current_class);
                 if (!cEntry || !((1 << (current_class - 1)) & CLASSMASK_ALL_PLAYABLE))
                 {
                     sLog.outErrorDb("Wrong class %u in `playercreateinfo_item` table, ignoring.", current_class);
@@ -2988,7 +2988,7 @@ void ObjectMgr::LoadPlayerInfo()
                     continue;
                 }
 
-                ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(current_class);
+                ChrClassesEntry const* cEntry = sDBCChrClasses.LookupEntry(current_class);
                 if (!cEntry || !((1 << (current_class - 1)) & CLASSMASK_ALL_PLAYABLE))
                 {
                     sLog.outErrorDb("Wrong class %u in `playercreateinfo_spell` table, ignoring.", current_class);
@@ -3050,7 +3050,7 @@ void ObjectMgr::LoadPlayerInfo()
                     continue;
                 }
 
-                ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(current_class);
+                ChrClassesEntry const* cEntry = sDBCChrClasses.LookupEntry(current_class);
                 if (!cEntry || !((1 << (current_class - 1)) & CLASSMASK_ALL_PLAYABLE))
                 {
                     sLog.outErrorDb("Wrong class %u in `playercreateinfo_action` table, ignoring.", current_class);
@@ -3153,7 +3153,7 @@ void ObjectMgr::LoadPlayerInfo()
     for (int class_ = 0; class_ < MAX_CLASSES; ++class_)
     {
         // skip nonexistent classes
-        if (!sChrClassesStore.LookupEntry(class_))
+        if (!sDBCChrClasses.LookupEntry(class_))
             continue;
 
         PlayerClassInfo* pClassInfo = &playerClassInfo[class_];
@@ -3211,7 +3211,7 @@ void ObjectMgr::LoadPlayerInfo()
                 continue;
             }
 
-            ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(current_class);
+            ChrClassesEntry const* cEntry = sDBCChrClasses.LookupEntry(current_class);
             if (!cEntry || !((1 << (current_class - 1)) & CLASSMASK_ALL_PLAYABLE))
             {
                 sLog.outErrorDb("Wrong class %u in `player_levelstats` table, ignoring.", current_class);
@@ -3262,7 +3262,7 @@ void ObjectMgr::LoadPlayerInfo()
         for (int class_ = 1; class_ < MAX_CLASSES; ++class_)
         {
             // skip nonexistent classes
-            if (!((1 << (class_ - 1)) & CLASSMASK_ALL_PLAYABLE) || !sChrClassesStore.LookupEntry(class_))
+            if (!((1 << (class_ - 1)) & CLASSMASK_ALL_PLAYABLE) || !sDBCChrClasses.LookupEntry(class_))
                 continue;
 
             PlayerInfo* pInfo = &playerInfo[race][class_];

src/game/Server/DBCStores.cpp

@@ -64,7 +64,7 @@
 //DBCStorage <CharStartOutfitEntry> sDBCCharStartOutfit(CharStartOutfitEntryfmt);
 //DBCStorage <CharTitlesEntry> sDBCCharTitles(CharTitlesEntryfmt);
 //DBCStorage <ChatChannelsEntry> sDBCChatChannels(ChatChannelsEntryfmt);
-DBCStorage <ChrClassesEntry> sChrClassesStore(ChrClassesEntryfmt);
+//DBCStorage <ChrClassesEntry> sDBCChrClasses(ChrClassesEntryfmt);
 DBCStorage <ChrRacesEntry> sChrRacesStore(ChrRacesEntryfmt);
 DBCStorage <CinematicCameraEntry> sCinematicCameraStore(CinematicCameraEntryfmt);
 DBCStorage <CinematicSequencesEntry> sCinematicSequencesStore(CinematicSequencesEntryfmt);
@@ -273,7 +273,7 @@ void LoadDBCStores(const std::string& dataPath)
 //    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sDBCCharStartOutfit,     dbcPath, "CharStartOutfit.dbc");
 //    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sDBCCharTitles,          dbcPath, "CharTitles.dbc");
 //    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sDBCChatChannels,        dbcPath, "ChatChannels.dbc");
-    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sChrClassesStore,          dbcPath, "ChrClasses.dbc");
+//    LoadDBC(availableDbcLocales, bar, bad_dbc_files, sDBCChrClasses,          dbcPath, "ChrClasses.dbc");
     LoadDBC(availableDbcLocales, bar, bad_dbc_files, sChrRacesStore,            dbcPath, "ChrRaces.dbc");
     LoadDBC(availableDbcLocales, bar, bad_dbc_files, sCinematicCameraStore,     dbcPath, "CinematicCamera.dbc");
     LoadDBC(availableDbcLocales, bar, bad_dbc_files, sCinematicSequencesStore,  dbcPath, "CinematicSequences.dbc");

src/game/Server/DBCStores.h

@@ -76,7 +76,7 @@ uint32 GetCreatureModelRace(uint32 model_id);
 //extern DBCStorage <CharStartOutfitEntry>         sDBCCharStartOutfit;
 //extern DBCStorage <CharTitlesEntry>              sDBCCharTitles;
 //extern DBCStorage <ChatChannelsEntry>            sDBCChatChannels;
-extern DBCStorage <ChrClassesEntry>              sChrClassesStore;
+//extern DBCStorage <ChrClassesEntry>              sDBCChrClasses;
 extern DBCStorage <ChrRacesEntry>                sChrRacesStore;
 extern DBCStorage <CinematicCameraEntry>         sCinematicCameraStore;
 extern DBCStorage <CinematicSequencesEntry>      sCinematicSequencesStore;