diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-07-12 15:36:55 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-23 00:06:16 +0100 |
| commit | 1e1679a1f7d9cdecb49f40f8084b46dbfd48577b (patch) | |
| tree | ef2e1aa948151f2efb2c8a999e9a71a6d4f17a4d /src/server/game/Chat | |
| parent | b7353fb92795801c2c2a52035026e9e0059fa83d (diff) | |
Core/DataStores: Port refactors from Update DBC field names to generated ones (#24999)
(cherry picked from commit c92950b3e1f6366d85d707365a8ad2caddafeecc)
Diffstat (limited to 'src/server/game/Chat')
| -rw-r--r-- | src/server/game/Chat/Channels/Channel.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Chat/Hyperlinks.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index baea34a3108..7f5a6cc8aec 100644 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -48,13 +48,13 @@ Channel::Channel(ObjectGuid const& guid, uint32 channelId, uint32 team /*= 0*/, _zoneEntry(zoneEntry) { ChatChannelsEntry const* channelEntry = sChatChannelsStore.AssertEntry(channelId); - if (channelEntry->Flags & CHANNEL_DBC_FLAG_TRADE) // for trade channel + if (channelEntry->Flags & CHANNEL_DBC_FLAG_TRADE) // for trade channel _channelFlags |= CHANNEL_FLAG_TRADE; - if (channelEntry->Flags & CHANNEL_DBC_FLAG_CITY_ONLY2) // for city only channels + if (channelEntry->Flags & CHANNEL_DBC_FLAG_CITY_ONLY2) // for city only channels _channelFlags |= CHANNEL_FLAG_CITY; - if (channelEntry->Flags & CHANNEL_DBC_FLAG_LFG) // for LFG channel + if (channelEntry->Flags & CHANNEL_DBC_FLAG_LFG) // for LFG channel _channelFlags |= CHANNEL_FLAG_LFG; else // for all other channels _channelFlags |= CHANNEL_FLAG_NOT_LFG; diff --git a/src/server/game/Chat/Hyperlinks.cpp b/src/server/game/Chat/Hyperlinks.cpp index 3b2f67bb832..88a4dcfae2b 100644 --- a/src/server/game/Chat/Hyperlinks.cpp +++ b/src/server/game/Chat/Hyperlinks.cpp @@ -495,9 +495,9 @@ struct LinkValidator<LinkTags::outfit> template <> struct LinkValidator<LinkTags::pvptal> { - static bool IsTextValid(PvpTalentEntry const* mawPower, char const* pos, size_t len) + static bool IsTextValid(PvpTalentEntry const* pvpTalent, char const* pos, size_t len) { - if (SpellInfo const* info = sSpellMgr->GetSpellInfo(mawPower->SpellID, DIFFICULTY_NONE)) + if (SpellInfo const* info = sSpellMgr->GetSpellInfo(pvpTalent->SpellID, DIFFICULTY_NONE)) return LinkValidator<LinkTags::spell>::IsTextValid(info, pos, len); return false; } @@ -511,9 +511,9 @@ struct LinkValidator<LinkTags::pvptal> template <> struct LinkValidator<LinkTags::talent> { - static bool IsTextValid(TalentEntry const* mawPower, char const* pos, size_t len) + static bool IsTextValid(TalentEntry const* talent, char const* pos, size_t len) { - if (SpellInfo const* info = sSpellMgr->GetSpellInfo(mawPower->SpellID, DIFFICULTY_NONE)) + if (SpellInfo const* info = sSpellMgr->GetSpellInfo(talent->SpellID, DIFFICULTY_NONE)) return LinkValidator<LinkTags::spell>::IsTextValid(info, pos, len); return false; } |