pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Beacon] Cleanup Beacons Code (#4024)

Browse Source 
# Notes
- Use constants where possible.
- Change `resist_adjust` parameter in `Beacon::AELocationSpell` from `resist_adjust` to `in_resist_adjust` so we're not possibly causing parameter shadowing.
This commit is contained in:
Alex King 2024-01-28 21:20:09 -05:00 committed by GitHub
parent 97c3205657
commit 7a770e0e08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
zone/beacon.cpp
View File

@ -107,15 +107,17 @@ Beacon::Beacon(const glm::vec4 &in_pos, int lifetime) : Mob(
{ {
remove_timer.Disable(); remove_timer.Disable();
spell_timer.Disable(); spell_timer.Disable();
remove_me = false;
spell_id = 0xFFFF;
resist_adjust = 0;
spell_iterations = 0;
caster_id = 0;
max_targets = 4; // default
if(lifetime) remove_me = false;
spell_id = UINT16_MAX;
resist_adjust = 0;
spell_iterations = 0;
caster_id = 0;
max_targets = 4;
if (lifetime) {
remove_timer.Start(); remove_timer.Start();
}
} }
Beacon::~Beacon() Beacon::~Beacon()
@ -125,55 +127,53 @@ Beacon::~Beacon()
bool Beacon::Process() bool Beacon::Process()
{ {
if(remove_me) if (remove_me) {
{
return false; return false;
} }
if if (
(
spell_timer.Enabled() && spell_timer.Enabled() &&
spell_timer.Check() && spell_timer.Check() &&
IsValidSpell(spell_id) IsValidSpell(spell_id)
) ) {
{ Mob* caster = entity_list.GetMob(caster_id);
Mob *caster = entity_list.GetMob(caster_id); if (caster && spell_iterations-- && max_targets) {
if(caster && spell_iterations-- && max_targets)
{
// NPCs should never be affected by an AE they cast. PB AEs shouldn't affect caster either // NPCs should never be affected by an AE they cast. PB AEs shouldn't affect caster either
// I don't think any other cases that get here matter // I don't think any other cases that get here matter
bool affect_caster = (!caster->IsNPC() && !caster->IsAIControlled()) && spells[spell_id].target_type != ST_AECaster; const bool affect_caster = (
!caster->IsNPC() &&
!caster->IsAIControlled() &&
spells[spell_id].target_type != ST_AECaster
);
entity_list.AESpell(caster, this, spell_id, affect_caster, resist_adjust, &max_targets); entity_list.AESpell(caster, this, spell_id, affect_caster, resist_adjust, &max_targets);
} } else {
else
{
// spell is done casting, or caster disappeared // spell is done casting, or caster disappeared
spell_id = 0xFFFF; caster_id = 0;
spell_id = UINT16_MAX;
spell_iterations = 0; spell_iterations = 0;
spell_timer.Disable(); spell_timer.Disable();
caster_id = 0;
} }
} }
if(remove_timer.Enabled() && remove_timer.Check()) if (remove_timer.Enabled() && remove_timer.Check()) {
{
return false; return false;
} }
return true; return true;
} }
void Beacon::AELocationSpell(Mob *caster, uint16 cast_spell_id, int16 resist_adjust) void Beacon::AELocationSpell(Mob *caster, uint16 cast_spell_id, int16 in_resist_adjust)
{ {
if (!IsValidSpell(cast_spell_id) || !caster) { if (!IsValidSpell(cast_spell_id) || !caster) {
return; return;
} }
caster_id = caster->GetID(); caster_id = caster->GetID();
spell_id = cast_spell_id; spell_id = cast_spell_id;
resist_adjust = resist_adjust; resist_adjust = in_resist_adjust;
spell_iterations = spells[spell_id].aoe_duration / 2500; spell_iterations = ((spells[spell_id].aoe_duration / 2500) < 1) ? 1 : spell_iterations;
spell_iterations = spell_iterations < 1 ? 1 : spell_iterations; // at least 1
if (spells[spell_id].aoe_max_targets) { if (spells[spell_id].aoe_max_targets) {
max_targets = spells[spell_id].aoe_max_targets; max_targets = spells[spell_id].aoe_max_targets;
} }

2
zone/beacon.h
View File

@ -46,7 +46,7 @@ public:
bool IsBeacon() const { return true; } bool IsBeacon() const { return true; }
bool Process(); bool Process();
virtual void Depop(bool not_used = true) { remove_me = true; } virtual void Depop(bool not_used = true) { remove_me = true; }
void AELocationSpell(Mob *caster, uint16 cast_spell_id, int16 resist_adjust); void AELocationSpell(Mob *caster, uint16 cast_spell_id, int16 in_resist_adjust);
protected: protected:
Timer remove_timer; Timer remove_timer;