From 8c7daebae902fc3b8fcd16113a89ea8d90d913f9 Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 18 Feb 2009 16:51:10 -0600 Subject: [7296] Fixed some GCC warnings. Author: VladimirMangos --HG-- branch : trunk --- src/game/Level2.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/game/Level2.cpp') diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index 05af6cbcbfe..21f196c74e2 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -1915,18 +1915,14 @@ bool ChatHandler::HandlePInfoCommand(const char* args) return false; } - char* FactionName; for(FactionStateList::const_iterator itr = target->m_factions.begin(); itr != target->m_factions.end(); ++itr) { FactionEntry const *factionEntry = sFactionStore.LookupEntry(itr->second.ID); - if (factionEntry) - FactionName = factionEntry->name[m_session->GetSessionDbcLocale()]; - else - FactionName = "#Not found#"; + char const* factionName = factionEntry ? factionEntry->name[m_session->GetSessionDbcLocale()] : "#Not found#"; ReputationRank rank = target->GetReputationRank(factionEntry); std::string rankName = GetTrinityString(ReputationRankStrIndex[rank]); std::ostringstream ss; - ss << itr->second.ID << ": |cffffffff|Hfaction:" << itr->second.ID << "|h[" << FactionName << "]|h|r " << rankName << "|h|r (" << target->GetReputation(factionEntry) << ")"; + ss << itr->second.ID << ": |cffffffff|Hfaction:" << itr->second.ID << "|h[" << factionName << "]|h|r " << rankName << "|h|r (" << target->GetReputation(factionEntry) << ")"; if(itr->second.Flags & FACTION_FLAG_VISIBLE) ss << GetTrinityString(LANG_FACTION_VISIBLE); -- cgit v1.2.3