diff options
author | Meji <alvaromegias_46@hotmail.com> | 2021-10-03 16:24:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-03 16:24:07 +0200 |
commit | 5c287929b216bf6d3818d77f507beb8dfb617a43 (patch) | |
tree | 4e7e9dc846d5156982ed7073e794d76588542d16 /src/server/game/Globals/ObjectMgr.cpp | |
parent | 81f9af0c37c7e2d78317f7a69d357825b03e643f (diff) |
Core/Gossip: Update GossipOptionIcon enum (#26906)
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index bbbe298a932..6eaa14f0879 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -9251,7 +9251,7 @@ void ObjectMgr::LoadGossipMenuItems() gMenuItem.MenuId = fields[0].GetUInt32(); gMenuItem.OptionIndex = fields[1].GetUInt32(); - gMenuItem.OptionIcon = fields[2].GetUInt8(); + gMenuItem.OptionIcon = GossipOptionIcon(fields[2].GetUInt8()); gMenuItem.OptionText = fields[3].GetString(); gMenuItem.OptionBroadcastTextId = fields[4].GetUInt32(); gMenuItem.OptionType = fields[5].GetUInt32(); @@ -9263,10 +9263,10 @@ void ObjectMgr::LoadGossipMenuItems() gMenuItem.BoxText = fields[11].GetString(); gMenuItem.BoxBroadcastTextId = fields[12].GetUInt32(); - if (gMenuItem.OptionIcon >= GOSSIP_ICON_MAX) + if (gMenuItem.OptionIcon >= GossipOptionIcon::Count) { - TC_LOG_ERROR("sql.sql", "Table `gossip_menu_option` for MenuId %u, OptionIndex %u has unknown icon id %u. Replacing with GOSSIP_ICON_CHAT", gMenuItem.MenuId, gMenuItem.OptionIndex, gMenuItem.OptionIcon); - gMenuItem.OptionIcon = GOSSIP_ICON_CHAT; + TC_LOG_ERROR("sql.sql", "Table `gossip_menu_option` for MenuId %u, OptionIndex %u has unknown icon id %u. Replacing with GossipOptionIcon::None", gMenuItem.MenuId, gMenuItem.OptionIndex, uint8(gMenuItem.OptionIcon)); + gMenuItem.OptionIcon = GossipOptionIcon::None; } if (gMenuItem.OptionBroadcastTextId) |