Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/DBC: Fixed DBC fmt introduced in 2bd28bce69

Browse Source 
* Improve invalid emblem color log message
This commit is contained in:
Carbenium
2015-06-11 13:07:54 +02:00
parent 2bd28bce69
commit 32b954923a
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/DataStores/DBCfmt.h
View File

@@ -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";

13
src/server/game/Guilds/Guild.cpp
View File

@@ -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;
}