[7296] Fixed some GCC warnings. Author: VladimirMangos

--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-18 16:51:10 -06:00
parent d0a3d03422
commit 8c7daebae9
4 changed files with 8 additions and 10 deletions

View File

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