Core/DBC: Fixed loading of NameGen.dbc

3 files changed, 10 insertions, 13 deletions

diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index 82e97e9f863..789d2f26309 100755
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -430,10 +430,8 @@ void LoadDBCStores(const std::string& dataPath)
 
     LoadDBC(availableDbcLocales, bad_dbc_files, sNameGenStore,                dbcPath, "NameGen.dbc");//14545
     for (uint32 i = 0; i < sNameGenStore.GetNumRows(); ++i)
-    {
         if (NameGenEntry const* entry = sNameGenStore.LookupEntry(i))
             sGenNameVectoArraysMap[entry->race].stringVectorArray[entry->gender].push_back(std::string(entry->name));
-    }
     sNameGenStore.Clear();
 
     LoadDBC(availableDbcLocales, bad_dbc_files, sMovieStore,                  dbcPath, "Movie.dbc");//14545
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index 08740a44f48..c4d52aa7d41 100755
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -128,7 +128,7 @@ struct AchievementCriteriaEntry
         } complete_quests_in_zone;
 
         // ACHIEVEMENT_CRITERIA_TYPE_CURRENCY = 12
-        struct  
+        struct
         {
             uint32 currency;
             uint32 count;
@@ -1436,6 +1436,14 @@ struct MovieEntry
     //uint32      unk2;                                     // 3 4.0.0
 };
 
+struct NameGenEntry
+{
+    //uint32 id;
+    char*  name;
+    uint32 race;
+    uint32 gender;
+};
+
 #define MAX_OVERRIDE_SPELL 10
 
 struct OverrideSpellDataEntry
@@ -2275,15 +2283,6 @@ struct WorldStateUI
 #pragma pack(pop)
 #endif
 
-// NamesGen.dbc
-struct NameGenEntry
-{
-    uint32 id;
-    char* name; 
-    uint32 race;
-    uint32 gender;
-};
-
 struct VectorArray
 {
     std::vector<std::string> stringVectorArray[2];
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index eeaeadfdfe4..65532474fa5 100755
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -99,7 +99,7 @@ const char MailTemplateEntryfmt[]="nxs";
 const char MapEntryfmt[]="nxixxxsixxixiffxiixx";
 const char MapDifficultyEntryfmt[]="diisiix";
 const char MovieEntryfmt[]="nxxx";
-const char NameGenfmt[] = "nsii";
+const char NameGenfmt[] = "dsii";
 const char OverrideSpellDatafmt[]="niiiiiiiiiixx";
 const char QuestSortEntryfmt[]="nx";
 const char QuestXPfmt[]="niiiiiiiiii";