Merge with master

This commit is contained in:
KimLS
2013-05-24 01:23:58 -07:00
54 changed files with 572 additions and 617 deletions
+2
View File
@@ -1485,11 +1485,13 @@ void EntityList::RemoveFromTargets(Mob* mob, bool RemoveFromXTargets)
m->RemoveFromHateList(mob);
if(RemoveFromXTargets)
{
if(m->IsClient())
m->CastToClient()->RemoveXTarget(mob, false);
// FadingMemories calls this function passing the client.
else if(mob->IsClient())
mob->CastToClient()->RemoveXTarget(m, false);
}
}
}