diff --git a/zone/merc.cpp b/zone/merc.cpp index 37155085f..c385f0d1f 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -37,9 +37,11 @@ Merc::Merc(const NPCType* d, float x, float y, float z, float heading) _baseFR = d->FR; _basePR = d->PR; _baseCorrup = d->Corrup; + _OwnerClientVersion = EQClientTitanium; RestRegenHP = 0; RestRegenMana = 0; RestRegenEndurance = 0; + cur_end = 0; _medding = false; _suspended = false; @@ -2749,7 +2751,7 @@ int16 Merc::GetFocusEffect(focusType type, uint16 spell_id) { int16 focus_max_real = 0; //item focus - for(int x=0; x<=MAX_WORN_INVENTORY; x++) + for(int x =0; x < MAX_WORN_INVENTORY; ++x) { TempItem = NULL; if (equipment[x] == 0) diff --git a/zone/mob.cpp b/zone/mob.cpp index 8bd2d362c..6c8bbc398 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -274,7 +274,7 @@ Mob::Mob(const char* in_name, memset(&itembonuses, 0, sizeof(StatBonuses)); memset(&spellbonuses, 0, sizeof(StatBonuses)); - //memset(&aabonuses, 0, sizeof(StatBonuses)); //don't need this until we start using Client::CalcAABonuses() + memset(&aabonuses, 0, sizeof(StatBonuses)); spellbonuses.AggroRange = -1; spellbonuses.AssistRange = -1; pLastChange = 0;