mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 13:37:05 +00:00
LfgDungeonsEntryfmt structure corrected
It did not reflect the contents of the DBC file, LFGDungeons.dbc
This commit is contained in:
parent
bc8e505c79
commit
47bafc8f08
3 changed files with 25 additions and 21 deletions
|
|
@ -1251,25 +1251,29 @@ struct ItemSetEntry
|
||||||
|
|
||||||
struct LfgDungeonsEntry
|
struct LfgDungeonsEntry
|
||||||
{
|
{
|
||||||
uint32 ID; // 0 m_ID
|
uint32 ID;
|
||||||
char* name[16]; // 1-16 m_name_lang
|
DBCString Name;
|
||||||
uint32 minLevel; // 18 m_minLevel
|
uint32 minLevel;
|
||||||
uint32 maxLevel; // 19 m_maxLevel
|
uint32 maxLevel;
|
||||||
uint32 targetLevel; // 20 m_target_level
|
uint32 target_level;
|
||||||
uint32 targetLevelMin; // 21 m_target_level_min
|
uint32 target_level_min;
|
||||||
uint32 targetLevelMax; // 22 m_target_level_max
|
uint32 target_level_max;
|
||||||
int32 mapID; // 23 m_mapID
|
float mapID;
|
||||||
uint32 difficulty; // 24 m_difficulty
|
uint32 difficulty;
|
||||||
uint32 flags; // 25 m_flags
|
uint32 flags;
|
||||||
uint32 typeID; // 26 m_typeID
|
uint32 typeID;
|
||||||
//uint32 faction; // 27 m_faction
|
float faction;
|
||||||
//char* textureFilename; // 28 m_textureFilename
|
DBCString textureFilename;
|
||||||
uint32 expansionLevel; // 29 m_expansionLevel
|
uint32 expansionLevel;
|
||||||
uint32 orderIndex; // 30 m_order_index
|
DBCString order_index;
|
||||||
uint32 groupID; // 31 m_group_id
|
uint32 group_id;
|
||||||
//char* description[16]; // 32-49 m_Description_lang
|
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
|
/*struct LfgDungeonGroupEntry
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ const char ItemRandomPropertiesfmt[]="nxiiiiis";
|
||||||
const char ItemRandomSuffixfmt[]="nsxiiiiiiiiii";
|
const char ItemRandomSuffixfmt[]="nsxiiiiiiiiii";
|
||||||
const char ItemReforgefmt[]="nifif";
|
const char ItemReforgefmt[]="nifif";
|
||||||
const char ItemSetEntryfmt[]="dsxxxxxxxxxxxxxxxxxiiiiiiiiiiiiiiiiii";
|
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 LiquidTypefmt[] = "nxxixixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
|
||||||
const char LockEntryfmt[] = "niiiiiiiiiiiiiiiiiiiiiiiixxxxxxxx";
|
const char LockEntryfmt[] = "niiiiiiiiiiiiiiiiiiiiiiiixxxxxxxx";
|
||||||
const char MailTemplateEntryfmt[]="nxs";
|
const char MailTemplateEntryfmt[]="nxs";
|
||||||
|
|
|
||||||
|
|
@ -238,14 +238,14 @@ void LFGMgr::JoinLFG(uint32 roles, std::set<uint32> dungeons, std::string commen
|
||||||
|
|
||||||
if (dungeon)
|
if (dungeon)
|
||||||
{
|
{
|
||||||
uint32 group = dungeon->groupID;
|
uint32 group = dungeon->group_id;
|
||||||
|
|
||||||
for (uint32 id = 0; id < sLfgDungeonsStore.GetNumRows(); ++id)
|
for (uint32 id = 0; id < sLfgDungeonsStore.GetNumRows(); ++id)
|
||||||
{
|
{
|
||||||
LfgDungeonsEntry const* dungeonList = sLfgDungeonsStore.LookupEntry(id);
|
LfgDungeonsEntry const* dungeonList = sLfgDungeonsStore.LookupEntry(id);
|
||||||
if (dungeonList)
|
if (dungeonList)
|
||||||
{
|
{
|
||||||
if (dungeonList->groupID == group)
|
if (dungeonList->group_id == group)
|
||||||
dungeons.insert(dungeonList->ID); // adding to set
|
dungeons.insert(dungeonList->ID); // adding to set
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue