Merge pull request #66 from j883376/gcc-changes

GCC Changes
This commit is contained in:
Alex
2013-05-24 01:16:10 -07:00
32 changed files with 115 additions and 85 deletions
+2
View File
@@ -7375,10 +7375,12 @@ FACTION_VALUE Client::GetFactionLevel(uint32 char_id, uint32 npc_id, uint32 p_ra
if (IsInvisible(tnpc))
return FACTION_INDIFFERENT;
if (tnpc && tnpc->GetOwnerID() != 0) // pets con amiably to owner and indiff to rest
{
if (char_id == tnpc->GetOwner()->CastToClient()->CharacterID())
return FACTION_AMIABLE;
else
return FACTION_INDIFFERENT;
}
//First get the NPC's Primary faction
if(pFaction > 0)