Fixed merc buffing bugs, added checks before dismissing merc to prevent possible bugged mercs, merged in Secret's merc memory leak fixes.

This commit is contained in:
badcaptain
2013-03-22 00:03:50 -04:00
parent 09df77b56e
commit a20c7735e8
6 changed files with 227 additions and 150 deletions
+3
View File
@@ -214,6 +214,9 @@ bool Group::AddMember(Mob* newmember, const char *NewMemberName, uint32 Characte
if(!newmember && !NewMemberName)
return false;
if(GroupCount() >= MAX_GROUP_MEMBERS) //Sanity check for merging groups together.
return false;
if(!newmember)
InZone = false;
else