pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 07:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Replace uses of SPELL_UNKNOWN with IsValidSpell() (#2938)

Browse Source
This commit is contained in:
Aeadoin
2023-02-15 22:01:35 -05:00
committed by GitHub
parent 4a64048744
commit 5ee2856133
14 changed files with 134 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spells.cpp
+25 -24
View File
@@ -1144,8 +1144,9 @@ void Mob::ZeroBardPulseVars()
void Mob::InterruptSpell(uint16 spellid)
{
if (spellid == SPELL_UNKNOWN)
if (!IsValidSpell(spellid)) {
spellid = casting_spell_id;
}
InterruptSpell(0, 0x121, spellid);
}
@@ -1156,7 +1157,7 @@ void Mob::InterruptSpell(uint16 message, uint16 color, uint16 spellid)
EQApplicationPacket *outapp = nullptr;
uint16 message_other;
bool bard_song_mode = false; //has the bard song gone to auto repeat mode
if (spellid == SPELL_UNKNOWN) {
if (!IsValidSpell(spellid)) {
if(bardsong) {
spellid = bardsong;
bard_song_mode = true;
@@ -3284,7 +3285,7 @@ uint32 Client::GetLastBuffSlot(bool disc, bool song)
bool Mob::HasDiscBuff()
{
int slot = GetFirstBuffSlot(true, false);
return buffs[slot].spellid != SPELL_UNKNOWN;
return IsValidSpell(buffs[slot].spellid);
}
// returns the slot the buff was added to, -1 if it wasn't added due to
@@ -3329,7 +3330,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid
for (buffslot = 0; buffslot < buff_count; buffslot++) {
const Buffs_Struct &curbuf = buffs[buffslot];
if (curbuf.spellid != SPELL_UNKNOWN) {
if (IsValidSpell(curbuf.spellid)) {
// there's a buff in this slot
ret = CheckStackConflict(curbuf.spellid, curbuf.casterlevel, spell_id,
caster_level, entity_list.GetMobID(curbuf.casterid), caster, buffslot);
@@ -3480,7 +3481,7 @@ int Mob::CanBuffStack(uint16 spellid, uint8 caster_level, bool iFailIfOverwrite)
const Buffs_Struct &curbuf = buffs[i];
// no buff in this slot
if (curbuf.spellid == SPELL_UNKNOWN)
if (!IsValidSpell(curbuf.spellid))
{
// if we haven't found a free slot, this is the first one so save it
if(firstfree == -2)
@@ -5865,7 +5866,7 @@ bool Client::SpellBucketCheck(uint16 spell_id, uint32 character_id) {
int16 Mob::GetBuffSlotFromType(uint16 type) {
uint32 buff_count = GetMaxTotalSlots();
for (int i = 0; i < buff_count; i++) {
if (buffs[i].spellid != SPELL_UNKNOWN) {
if (IsValidSpell(buffs[i].spellid)) {
for (int j = 0; j < EFFECT_COUNT; j++) {
if (spells[buffs[i].spellid].effect_id[j] == type )
return i;
@@ -5877,8 +5878,9 @@ int16 Mob::GetBuffSlotFromType(uint16 type) {
uint16 Mob::GetSpellIDFromSlot(uint8 slot)
{
if (buffs[slot].spellid != SPELL_UNKNOWN)
if (IsValidSpell(buffs[slot].spellid)) {
return buffs[slot].spellid;
}
return 0;
}
@@ -5920,7 +5922,7 @@ bool Mob::IsCombatProc(uint16 spell_id) {
return false;
}
if (spell_id == SPELL_UNKNOWN) {
if (!IsValidSpell(spell_id)) {
return(false);
}
/*
@@ -5948,13 +5950,13 @@ bool Mob::IsCombatProc(uint16 spell_id) {
}
bool Mob::AddProcToWeapon(uint16 spell_id, bool bPerma, uint16 iChance, uint16 base_spell_id, int level_override, uint32 proc_reuse_time) {
if(spell_id == SPELL_UNKNOWN)
if(!IsValidSpell(spell_id))
return(false);
int i;
if (bPerma) {
for (i = 0; i < MAX_PROCS; i++) {
if (PermaProcs[i].spellID == SPELL_UNKNOWN) {
if (!IsValidSpell(PermaProcs[i].spellID)) {
PermaProcs[i].spellID = spell_id;
PermaProcs[i].chance = iChance;
PermaProcs[i].base_spellID = base_spell_id;
@@ -5986,7 +5988,7 @@ bool Mob::AddProcToWeapon(uint16 spell_id, bool bPerma, uint16 iChance, uint16 b
// Find a slot and use it as normal.
for (i = 0; i < MAX_PROCS; i++) {
if (SpellProcs[i].spellID == SPELL_UNKNOWN) {
if (!IsValidSpell(SpellProcs[i].spellID)) {
SpellProcs[i].spellID = spell_id;
SpellProcs[i].chance = iChance;
SpellProcs[i].base_spellID = base_spell_id;;
@@ -6017,12 +6019,12 @@ bool Mob::RemoveProcFromWeapon(uint16 spell_id, bool bAll) {
bool Mob::AddDefensiveProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id, uint32 proc_reuse_time)
{
if(spell_id == SPELL_UNKNOWN)
if(!IsValidSpell(spell_id))
return(false);
int i;
for (i = 0; i < MAX_PROCS; i++) {
if (DefensiveProcs[i].spellID == SPELL_UNKNOWN) {
if (!IsValidSpell(DefensiveProcs[i].spellID)) {
DefensiveProcs[i].spellID = spell_id;
DefensiveProcs[i].chance = iChance;
DefensiveProcs[i].base_spellID = base_spell_id;
@@ -6051,12 +6053,12 @@ bool Mob::RemoveDefensiveProc(uint16 spell_id, bool bAll)
bool Mob::AddRangedProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id, uint32 proc_reuse_time)
{
if(spell_id == SPELL_UNKNOWN)
if(!IsValidSpell(spell_id))
return(false);
int i;
for (i = 0; i < MAX_PROCS; i++) {
if (RangedProcs[i].spellID == SPELL_UNKNOWN) {
if (!IsValidSpell(RangedProcs[i].spellID)) {
RangedProcs[i].spellID = spell_id;
RangedProcs[i].chance = iChance;
RangedProcs[i].base_spellID = base_spell_id;
@@ -6087,17 +6089,16 @@ bool Mob::RemoveRangedProc(uint16 spell_id, bool bAll)
// behavior should be used.
bool Mob::UseBardSpellLogic(uint16 spell_id, int slot)
{
if(spell_id == SPELL_UNKNOWN)
if (!IsValidSpell(spell_id)) {
spell_id = casting_spell_id;
if(slot == -1)
}
if (slot == -1) {
slot = static_cast<int>(casting_spell_slot);
}
// should we treat this as a bard singing?
return
(
spell_id != 0 &&
spell_id != SPELL_UNKNOWN &&
IsValidSpell(spell_id) &&
slot != -1 &&
GetClass() == BARD &&
slot <= EQ::spells::SPELL_GEM_COUNT &&
@@ -6193,7 +6194,7 @@ void Mob::SendPetBuffsToClient()
for(int buffslot = 0; buffslot < MaxSlots; buffslot++)
{
if(buffs[buffslot].spellid != SPELL_UNKNOWN) {
if (IsValidSpell(buffs[buffslot].spellid)) {
pbs->spellid[buffslot] = buffs[buffslot].spellid;
pbs->ticsremaining[buffslot] = buffs[buffslot].ticsremaining;
PetBuffCount++;
@@ -6225,7 +6226,7 @@ EQApplicationPacket *Mob::MakeBuffsPacket(bool for_target)
uint32 buff_count = for_target ? GetMaxBuffSlots() : GetMaxTotalSlots();
for(int i = 0; i < buff_count; ++i)
{
if(buffs[i].spellid != SPELL_UNKNOWN)
if (IsValidSpell(buffs[i].spellid))
{
++count;
}
@@ -6258,7 +6259,7 @@ EQApplicationPacket *Mob::MakeBuffsPacket(bool for_target)
uint32 index = 0;
for(int i = 0; i < buff_count; ++i)
{
if(buffs[i].spellid != SPELL_UNKNOWN)
if (IsValidSpell(buffs[i].spellid))
{
buff->entries[index].buff_slot = i;
buff->entries[index].spell_id = buffs[i].spellid;