diff --git a/src/game/Server/DBCStructure.h b/src/game/Server/DBCStructure.h index 507c41202..b86b74b81 100644 --- a/src/game/Server/DBCStructure.h +++ b/src/game/Server/DBCStructure.h @@ -1251,25 +1251,29 @@ struct ItemSetEntry struct LfgDungeonsEntry { - uint32 ID; // 0 m_ID - char* name[16]; // 1-16 m_name_lang - uint32 minLevel; // 18 m_minLevel - uint32 maxLevel; // 19 m_maxLevel - uint32 targetLevel; // 20 m_target_level - uint32 targetLevelMin; // 21 m_target_level_min - uint32 targetLevelMax; // 22 m_target_level_max - int32 mapID; // 23 m_mapID - uint32 difficulty; // 24 m_difficulty - uint32 flags; // 25 m_flags - uint32 typeID; // 26 m_typeID - //uint32 faction; // 27 m_faction - //char* textureFilename; // 28 m_textureFilename - uint32 expansionLevel; // 29 m_expansionLevel - uint32 orderIndex; // 30 m_order_index - uint32 groupID; // 31 m_group_id - //char* description[16]; // 32-49 m_Description_lang + uint32 ID; + DBCString Name; + uint32 minLevel; + uint32 maxLevel; + uint32 target_level; + uint32 target_level_min; + uint32 target_level_max; + float mapID; + uint32 difficulty; + uint32 flags; + uint32 typeID; + float faction; + DBCString textureFilename; + uint32 expansionLevel; + DBCString order_index; + uint32 group_id; + DBCString description_lang; + uint32 col17; + uint32 col18; + uint32 col19; + uint32 col20; - uint32 Entry() const { return ID + ((uint8)typeID << 24); } + uint32 Entry() const { return ID + ((uint8)typeID << 24); } }; /*struct LfgDungeonGroupEntry diff --git a/src/game/Server/DBCfmt.h b/src/game/Server/DBCfmt.h index d5daaa860..e208336ce 100644 --- a/src/game/Server/DBCfmt.h +++ b/src/game/Server/DBCfmt.h @@ -90,7 +90,7 @@ const char ItemRandomPropertiesfmt[]="nxiiiiis"; const char ItemRandomSuffixfmt[]="nsxiiiiiiiiii"; const char ItemReforgefmt[]="nifif"; const char ItemSetEntryfmt[]="dsxxxxxxxxxxxxxxxxxiiiiiiiiiiiiiiiiii"; -const char LfgDungeonsEntryfmt[] = "nssssssssssssssssxiiiiiiiiixxiiixxxxxxxxxxxxxxxxx"; // taken from Two, this may not be correct for Three (chucky) +const char LfgDungeonsEntryfmt[] = "isiiiiifiiifsisisiiii"; const char LiquidTypefmt[] = "nxxixixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; const char LockEntryfmt[] = "niiiiiiiiiiiiiiiiiiiiiiiixxxxxxxx"; const char MailTemplateEntryfmt[]="nxs"; diff --git a/src/game/WorldHandlers/LFGMgr.cpp b/src/game/WorldHandlers/LFGMgr.cpp index 1291e73ff..b7e2c5bb7 100644 --- a/src/game/WorldHandlers/LFGMgr.cpp +++ b/src/game/WorldHandlers/LFGMgr.cpp @@ -238,14 +238,14 @@ void LFGMgr::JoinLFG(uint32 roles, std::set dungeons, std::string commen if (dungeon) { - uint32 group = dungeon->groupID; + uint32 group = dungeon->group_id; for (uint32 id = 0; id < sLfgDungeonsStore.GetNumRows(); ++id) { LfgDungeonsEntry const* dungeonList = sLfgDungeonsStore.LookupEntry(id); if (dungeonList) { - if (dungeonList->groupID == group) + if (dungeonList->group_id == group) dungeons.insert(dungeonList->ID); // adding to set } }