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

Some whitespace fixes in zone/spells.cpp

Browse Source
This commit is contained in:
Michael Cook (mackal) 2013-11-17 00:34:58 -05:00
parent 3d5b3d1e8c
commit 36233538fd
1 changed files with 90 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zone/spells.cpp
View File

@ -16,9 +16,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/* /*
General outline of spell casting process General outline of spell casting process
1. 1.
@ -64,14 +62,10 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
If this was timed, CastedSpellFinished() will restore the client's If this was timed, CastedSpellFinished() will restore the client's
spell bar gems. spell bar gems.
Most user code should call CastSpell(), with a 0 casting time if needed, Most user code should call CastSpell(), with a 0 casting time if needed,
and not SpellFinished(). and not SpellFinished().
*/ */
#include "../common/debug.h" #include "../common/debug.h"
#include "../common/spdat.h" #include "../common/spdat.h"
#include "masterentity.h" #include "masterentity.h"
@ -342,7 +336,6 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, uint16 slot,
mlog(SPELLS__CASTING, "DoCastSpell called for spell %s (%d) on entity %d, slot %d, time %d, mana %d, from item %d", mlog(SPELLS__CASTING, "DoCastSpell called for spell %s (%d) on entity %d, slot %d, time %d, mana %d, from item %d",
spell.name, spell_id, target_id, slot, cast_time, mana_cost, item_slot==0xFFFFFFFF?999:item_slot); spell.name, spell_id, target_id, slot, cast_time, mana_cost, item_slot==0xFFFFFFFF?999:item_slot);
casting_spell_id = spell_id; casting_spell_id = spell_id;
casting_spell_slot = slot; casting_spell_slot = slot;
casting_spell_inventory_slot = item_slot; casting_spell_inventory_slot = item_slot;
@ -1787,7 +1780,6 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16
} }
} }
//determine the type of spell target we have //determine the type of spell target we have
CastAction_type CastAction; CastAction_type CastAction;
if(!DetermineSpellTargets(spell_id, spell_target, ae_center, CastAction)) if(!DetermineSpellTargets(spell_id, spell_target, ae_center, CastAction))
@ -2161,7 +2153,6 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, uint16 slot) {
SetMana(GetMana() - mana_used); SetMana(GetMana() - mana_used);
} }
// check line of sight to target if it's a detrimental spell // check line of sight to target if it's a detrimental spell
if(spell_target && IsDetrimentalSpell(spell_id) && !CheckLosFN(spell_target)) if(spell_target && IsDetrimentalSpell(spell_id) && !CheckLosFN(spell_target))
{ {
@ -2652,7 +2643,6 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
continue; continue;
} }
/* /*
Skip check if effect is SE_Limit* Skip check if effect is SE_Limit*
skip checking effect2 since we know they are equal skip checking effect2 since we know they are equal
@ -2989,7 +2979,6 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid
SendPetBuffsToClient(); SendPetBuffsToClient();
} }
if((IsClient() && !CastToClient()->GetPVP()) || (IsPet() && GetOwner() && GetOwner()->IsClient() && !GetOwner()->CastToClient()->GetPVP()) || if((IsClient() && !CastToClient()->GetPVP()) || (IsPet() && GetOwner() && GetOwner()->IsClient() && !GetOwner()->CastToClient()->GetPVP()) ||
(IsMerc() && GetOwner() && GetOwner()->IsClient() && !GetOwner()->CastToClient()->GetPVP())) (IsMerc() && GetOwner() && GetOwner()->IsClient() && !GetOwner()->CastToClient()->GetPVP()))
{ {
@ -3181,7 +3170,6 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r
// send to people in the area, ignoring caster and target // send to people in the area, ignoring caster and target
entity_list.QueueCloseClients(spelltar, action_packet, true, 200, this, true, spelltar->IsClient() ? FilterPCSpells : FilterNPCSpells); entity_list.QueueCloseClients(spelltar, action_packet, true, 200, this, true, spelltar->IsClient() ? FilterPCSpells : FilterNPCSpells);
/* Send the EVENT_CAST_ON event */ /* Send the EVENT_CAST_ON event */
if(spelltar->IsNPC()) if(spelltar->IsNPC())
{ {
@ -3312,7 +3300,6 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r
} }
if(!IsBeneficialAllowed(spelltar) || if(!IsBeneficialAllowed(spelltar) ||
(IsGroupOnlySpell(spell_id) && (IsGroupOnlySpell(spell_id) &&
!( !(
@ -3349,7 +3336,6 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r
// ok at this point the spell is permitted to affect the target, // ok at this point the spell is permitted to affect the target,
// but we need to check special cases and resists // but we need to check special cases and resists
// check immunities // check immunities
if(spelltar->IsImmuneToSpell(spell_id, this)) if(spelltar->IsImmuneToSpell(spell_id, this))
{ {
@ -4092,7 +4078,6 @@ float Mob::ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use
} }
} }
if (!CharismaCheck){ if (!CharismaCheck){
//Check for Spell Effect specific resistance chances (ie AA Mental Fortitude) //Check for Spell Effect specific resistance chances (ie AA Mental Fortitude)
@ -4801,7 +4786,6 @@ uint16 Mob::GetSpellIDFromSlot(uint8 slot)
return 0; return 0;
} }
bool Mob::FindType(uint16 type, bool bOffensive, uint16 threshold) { bool Mob::FindType(uint16 type, bool bOffensive, uint16 threshold) {
uint32 buff_count = GetMaxTotalSlots(); uint32 buff_count = GetMaxTotalSlots();
for (int i = 0; i < buff_count; i++) { for (int i = 0; i < buff_count; i++) {
@ -5000,7 +4984,6 @@ int Mob::GetCasterLevel(uint16 spell_id) {
return(level); return(level);
} }
//this method does NOT tell the client to stop singing the song. //this method does NOT tell the client to stop singing the song.
//this is NOT the right way to stop a mob from singing, use InterruptSpell //this is NOT the right way to stop a mob from singing, use InterruptSpell
//you should really know what your doing before you call this //you should really know what your doing before you call this
@ -5043,7 +5026,6 @@ void Mob::SendPetBuffsToClient()
int PetBuffCount = 0; int PetBuffCount = 0;
EQApplicationPacket* outapp = new EQApplicationPacket(OP_PetBuffWindow,sizeof(PetBuff_Struct)); EQApplicationPacket* outapp = new EQApplicationPacket(OP_PetBuffWindow,sizeof(PetBuff_Struct));
PetBuff_Struct* pbs=(PetBuff_Struct*)outapp->pBuffer; PetBuff_Struct* pbs=(PetBuff_Struct*)outapp->pBuffer;
memset(outapp->pBuffer,0,outapp->size); memset(outapp->pBuffer,0,outapp->size);
@ -5122,8 +5104,6 @@ EQApplicationPacket *Mob::MakeBuffsPacket(bool for_target)
return outapp; return outapp;
} }
void Mob::BuffModifyDurationBySpellID(uint16 spell_id, int32 newDuration) void Mob::BuffModifyDurationBySpellID(uint16 spell_id, int32 newDuration)
{ {
uint32 buff_count = GetMaxTotalSlots(); uint32 buff_count = GetMaxTotalSlots();