diff options
| author | Carbenium <carbenium@outlook.com> | 2015-06-11 13:07:54 +0200 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2015-06-11 13:07:54 +0200 |
| commit | 32b954923a99edaf640ed258a1fce1f347f59883 (patch) | |
| tree | 881dff22e3d4c45467c5023d735a0c19f10dfc16 | |
| parent | 2bd28bce696dfbed6e3e96acd37069f591f29fd4 (diff) | |
Core/DBC: Fixed DBC fmt introduced in 2bd28bce696dfbed6e3e96acd37069f591f29fd4
* Improve invalid emblem color log message
| -rw-r--r-- | src/server/game/DataStores/DBCfmt.h | 6 | ||||
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 13 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h index 511e7e25006..c7aa00286e1 100644 --- a/src/server/game/DataStores/DBCfmt.h +++ b/src/server/game/DataStores/DBCfmt.h @@ -88,9 +88,9 @@ char const GtSpellScalingfmt[] = "df"; char const GtOCTBaseHPByClassfmt[] = "df"; char const GtOCTBaseMPByClassfmt[] = "df"; char const GuildPerkSpellsfmt[] = "dii"; -char const GuildColorBackgroundfmt[] = "iXXX"; -char const GuildColorBorderfmt[] = "iXXX"; -char const GuildColorEmblemfmt[] = "iXXX"; +char const GuildColorBackgroundfmt[] = "nXXX"; +char const GuildColorBorderfmt[] = "nXXX"; +char const GuildColorEmblemfmt[] = "nXXX"; char const ImportPriceArmorfmt[] = "nffff"; char const ImportPriceQualityfmt[] = "nf"; char const ImportPriceShieldfmt[] = "nf"; diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index d7448c50728..d4ba420d44d 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -680,12 +680,10 @@ void EmblemInfo::ReadPacket(WorldPackets::Guild::SaveGuildEmblem& packet) bool EmblemInfo::ValidateEmblemColors() { - if (sGuildColorBackgroundStore.LookupEntry(m_backgroundColor) && - sGuildColorBorderStore.LookupEntry(m_borderColor) && - sGuildColorEmblemStore.LookupEntry(m_color)) - return true; - - return false; + return sGuildColorBackgroundStore.LookupEntry(m_backgroundColor) && + sGuildColorBorderStore.LookupEntry(m_borderColor) && + sGuildColorEmblemStore.LookupEntry(m_color); + } bool EmblemInfo::LoadFromDB(Field* fields) @@ -2259,7 +2257,8 @@ bool Guild::LoadFromDB(Field* fields) if (!m_emblemInfo.LoadFromDB(fields)) { - TC_LOG_ERROR("guild", "Guild " UI64FMTD " has invalid emblem colors, skipped.", m_id); + TC_LOG_ERROR("guild", "Guild " UI64FMTD " has invalid emblem colors (Background: %u, Border: %u, Emblem: %u), skipped.", + m_id, m_emblemInfo.GetBackgroundColor(), m_emblemInfo.GetBorderColor(), m_emblemInfo.GetColor()); return false; } |