pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-06 02:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Removed unused pointer. Fixes #157. (#1748)

Browse Source
This commit is contained in:
JJ 2021-11-13 10:39:35 -05:00 committed by GitHub
parent e8607a0c78
commit cef352f0ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/hate_list.cpp
View File

@ -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. //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. //Unclear from description that pets are required to be 'summoned body type'. Will not require at this time.

2
zone/hate_list.h
View File

@ -60,7 +60,7 @@ public:
bool RemoveEntFromHateList(Mob *ent); bool RemoveEntFromHateList(Mob *ent);
int AreaRampage(Mob *caster, Mob *target, int count, ExtraAttackOptions *opts); int AreaRampage(Mob *caster, Mob *target, int count, ExtraAttackOptions *opts);
int GetSummonedPetCountOnHateList(Mob *hater); int GetSummonedPetCountOnHateList();
int GetHateRatio(Mob *top, Mob *other); int GetHateRatio(Mob *top, Mob *other);
int32 GetEntHateAmount(Mob *ent, bool in_damage = false); int32 GetEntHateAmount(Mob *ent, bool in_damage = false);

12
zone/spell_effects.cpp
View File

@ -7651,7 +7651,7 @@ bool Mob::PassCastRestriction(int value)
break; break;
case HAS_BETWEEN_1_TO_2_PETS_ON_HATELIST: { 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) { if (count >= 1 && count <= 2) {
return true; return true;
} }
@ -7659,7 +7659,7 @@ bool Mob::PassCastRestriction(int value)
} }
case HAS_BETWEEN_3_TO_5_PETS_ON_HATELIST: { 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) { if (count >= 3 && count <= 5) {
return true; return true;
} }
@ -7667,7 +7667,7 @@ bool Mob::PassCastRestriction(int value)
} }
case HAS_BETWEEN_6_TO_9_PETS_ON_HATELIST: { 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) { if (count >= 6 && count <= 9) {
return true; return true;
} }
@ -7675,7 +7675,7 @@ bool Mob::PassCastRestriction(int value)
} }
case HAS_BETWEEN_10_TO_14_PETS_ON_HATELIST: { 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) { if (count >= 10 && count <= 14) {
return true; return true;
} }
@ -7683,7 +7683,7 @@ bool Mob::PassCastRestriction(int value)
} }
case HAS_MORE_THAN_14_PETS_ON_HATELIST: { case HAS_MORE_THAN_14_PETS_ON_HATELIST: {
int count = hate_list.GetSummonedPetCountOnHateList(this); int count = hate_list.GetSummonedPetCountOnHateList();
if (count > 14) { if (count > 14) {
return true; 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) { 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; int minium_amount_of_pets_needed = (1 + value) - HAS_AT_LEAST_1_PET_ON_HATELIST;
if (count >= minium_amount_of_pets_needed) { if (count >= minium_amount_of_pets_needed) {