diff --git a/zone/hate_list.cpp b/zone/hate_list.cpp index 5e13f3ed5..83ec481fa 100644 --- a/zone/hate_list.cpp +++ b/zone/hate_list.cpp @@ -266,7 +266,7 @@ void HateList::DoFactionHits(int32 npc_faction_level_id) { } } -int HateList::GetSummonedPetCountOnHateList(Mob *hater) { +int HateList::GetSummonedPetCountOnHateList() { //Function to get number of 'Summoned' pets on a targets hate list to allow calculations for certian spell effects. //Unclear from description that pets are required to be 'summoned body type'. Will not require at this time. diff --git a/zone/hate_list.h b/zone/hate_list.h index 22971aa2e..0dbfae841 100644 --- a/zone/hate_list.h +++ b/zone/hate_list.h @@ -60,7 +60,7 @@ public: bool RemoveEntFromHateList(Mob *ent); int AreaRampage(Mob *caster, Mob *target, int count, ExtraAttackOptions *opts); - int GetSummonedPetCountOnHateList(Mob *hater); + int GetSummonedPetCountOnHateList(); int GetHateRatio(Mob *top, Mob *other); int32 GetEntHateAmount(Mob *ent, bool in_damage = false); diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index f79515198..efe826c9d 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -7651,7 +7651,7 @@ bool Mob::PassCastRestriction(int value) break; case HAS_BETWEEN_1_TO_2_PETS_ON_HATELIST: { - int count = hate_list.GetSummonedPetCountOnHateList(this); + int count = hate_list.GetSummonedPetCountOnHateList(); if (count >= 1 && count <= 2) { return true; } @@ -7659,7 +7659,7 @@ bool Mob::PassCastRestriction(int value) } case HAS_BETWEEN_3_TO_5_PETS_ON_HATELIST: { - int count = hate_list.GetSummonedPetCountOnHateList(this); + int count = hate_list.GetSummonedPetCountOnHateList(); if (count >= 3 && count <= 5) { return true; } @@ -7667,7 +7667,7 @@ bool Mob::PassCastRestriction(int value) } case HAS_BETWEEN_6_TO_9_PETS_ON_HATELIST: { - int count = hate_list.GetSummonedPetCountOnHateList(this); + int count = hate_list.GetSummonedPetCountOnHateList(); if (count >= 6 && count <= 9) { return true; } @@ -7675,7 +7675,7 @@ bool Mob::PassCastRestriction(int value) } case HAS_BETWEEN_10_TO_14_PETS_ON_HATELIST: { - int count = hate_list.GetSummonedPetCountOnHateList(this); + int count = hate_list.GetSummonedPetCountOnHateList(); if (count >= 10 && count <= 14) { return true; } @@ -7683,7 +7683,7 @@ bool Mob::PassCastRestriction(int value) } case HAS_MORE_THAN_14_PETS_ON_HATELIST: { - int count = hate_list.GetSummonedPetCountOnHateList(this); + int count = hate_list.GetSummonedPetCountOnHateList(); if (count > 14) { return true; } @@ -8239,7 +8239,7 @@ bool Mob::PassCastRestriction(int value) } if (value >= HAS_AT_LEAST_1_PET_ON_HATELIST && value <= HAS_AT_LEAST_20_PETS_ON_HATELIST) { - int count = hate_list.GetSummonedPetCountOnHateList(this); + int count = hate_list.GetSummonedPetCountOnHateList(); int minium_amount_of_pets_needed = (1 + value) - HAS_AT_LEAST_1_PET_ON_HATELIST; if (count >= minium_amount_of_pets_needed) {