Index: /trunk/src/shared/Database/DBCStores.cpp =================================================================== --- /trunk/src/shared/Database/DBCStores.cpp (revision 102) +++ /trunk/src/shared/Database/DBCStores.cpp (revision 229) @@ -330,5 +330,5 @@ LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTalentTabStore, dbcPath,"TalentTab.dbc"); - // preper fast data access to bit pos of talent ranks for use at inspecting + // prepare fast data access to bit pos of talent ranks for use at inspecting { // fill table by amount of talent ranks and fill sTalentTabBitSizeInInspect Index: /trunk/src/game/WorldSocketMgr.cpp =================================================================== --- /trunk/src/game/WorldSocketMgr.cpp (revision 149) +++ /trunk/src/game/WorldSocketMgr.cpp (revision 229) @@ -166,5 +166,5 @@ while (!m_Reactor->reactor_event_loop_done ()) { - // dont be too smart to move this outside the loop + // Don't be too smart to move this outside the loop // the run_reactor_event_loop will modify interval ACE_Time_Value interval (0, 10000); Index: /trunk/src/game/SpellEffects.cpp =================================================================== --- /trunk/src/game/SpellEffects.cpp (revision 227) +++ /trunk/src/game/SpellEffects.cpp (revision 229) @@ -810,5 +810,5 @@ case 13567: // Dummy Trigger { - // can be used for different aura triggreing, so select by aura + // can be used for different aura triggering, so select by aura if(!m_triggeredByAuraSpell || !unitTarget) return; @@ -1353,5 +1353,5 @@ case 25461: spellid = 25460; break; // Rank 7 default: - sLog.outError("Spell::EffectDummy: Spell 28598 triggered by unhandeled spell %u",m_triggeredByAuraSpell->Id); + sLog.outError("Spell::EffectDummy: Spell 28598 triggered by unhandled spell %u",m_triggeredByAuraSpell->Id); return; } @@ -2666,5 +2666,5 @@ // Some level depends spells - int multipler = 0; + int multiplier = 0; int level_diff = 0; switch (m_spellInfo->Id) @@ -2673,15 +2673,15 @@ case 9512: level_diff = m_caster->getLevel() - 40; - multipler = 2; + multiplier = 2; break; // Blood Fury case 24571: level_diff = m_caster->getLevel() - 60; - multipler = 10; + multiplier = 10; break; // Burst of Energy case 24532: level_diff = m_caster->getLevel() - 60; - multipler = 4; + multiplier = 4; break; default: @@ -2690,5 +2690,5 @@ if (level_diff > 0) - damage -= multipler * level_diff; + damage -= multiplier * level_diff; if(damage < 0) @@ -3293,5 +3293,5 @@ return; - // Fill possible dispell list + // Fill possible dispel list std::vector dispel_list; @@ -3328,5 +3328,5 @@ std::list < uint32 > fail_list; // spell_id int32 list_size = dispel_list.size(); - // Dispell N = damage buffs (or while exist buffs for dispel) + // dispel N = damage buffs (or while exist buffs for dispel) for (int32 count=0; count < damage && list_size > 0; ++count) { @@ -3352,6 +3352,6 @@ for (std::vector::iterator j = dispel_list.begin(); j != dispel_list.end(); ) { - Aura *dispeled = *j; - if (dispeled->GetId() == aur->GetId() && dispeled->GetCasterGUID() == aur->GetCasterGUID()) + Aura *dispelled = *j; + if (dispelled->GetId() == aur->GetId() && dispelled->GetCasterGUID() == aur->GetCasterGUID()) { j = dispel_list.erase(j); @@ -3369,5 +3369,5 @@ data.append(unitTarget->GetPackGUID()); // Victim GUID data.append(m_caster->GetPackGUID()); // Caster GUID - data << uint32(m_spellInfo->Id); // Dispell spell id + data << uint32(m_spellInfo->Id); // dispel spell id data << uint8(0); // not used data << uint32(count); // count @@ -3376,5 +3376,5 @@ SpellEntry const* spellInfo = sSpellStore.LookupEntry(j->first); data << uint32(spellInfo->Id); // Spell Id - data << uint8(0); // 0 - dispeled !=0 cleansed + data << uint8(0); // 0 - dispelled !=0 cleansed unitTarget->RemoveAurasDueToSpellByDispel(spellInfo->Id, j->second, m_caster); } @@ -3409,5 +3409,5 @@ data << uint64(m_caster->GetGUID()); // Caster GUID data << uint64(unitTarget->GetGUID()); // Victim GUID - data << uint32(m_spellInfo->Id); // Dispell spell id + data << uint32(m_spellInfo->Id); // dispel spell id for (std::list< uint32 >::iterator j = fail_list.begin(); j != fail_list.end(); ++j) data << uint32(*j); // Spell Id @@ -6225,5 +6225,5 @@ std::list < std::pair > success_list; int32 list_size = steal_list.size(); - // Dispell N = damage buffs (or while exist buffs for dispel) + // dispel N = damage buffs (or while exist buffs for dispel) for (int32 count=0; count < damage && list_size > 0; ++count) { @@ -6254,5 +6254,5 @@ data.append(unitTarget->GetPackGUID()); // Victim GUID data.append(m_caster->GetPackGUID()); // Caster GUID - data << uint32(m_spellInfo->Id); // Dispell spell id + data << uint32(m_spellInfo->Id); // dispel spell id data << uint8(0); // not used data << uint32(count); // count Index: /trunk/src/game/Level3.cpp =================================================================== --- /trunk/src/game/Level3.cpp (revision 209) +++ /trunk/src/game/Level3.cpp (revision 229) @@ -53,5 +53,4 @@ #include "InstanceSaveMgr.h" #include "InstanceData.h" -#include "AccountMgr.h" //reload commands Index: /trunk/src/game/WaypointMovementGenerator.cpp =================================================================== --- /trunk/src/game/WaypointMovementGenerator.cpp (revision 102) +++ /trunk/src/game/WaypointMovementGenerator.cpp (revision 229) @@ -154,5 +154,5 @@ if( !behavior->text[1].empty() ) { - // Select one from max 5 texts (0 and 1 laready checked) + // Select one from max 5 texts (0 and 1 already checked) int i = 2; for( ; i < 5; ++i ) Index: /trunk/src/game/Chat.cpp =================================================================== --- /trunk/src/game/Chat.cpp (revision 221) +++ /trunk/src/game/Chat.cpp (revision 229) @@ -1025,5 +1025,5 @@ return NULL; - // skip speces + // skip spaces while(*text==' '||*text=='\t'||*text=='\b') ++text; @@ -1073,5 +1073,5 @@ return NULL; - // skip speces + // skip spaces while(*text==' '||*text=='\t'||*text=='\b') ++text; Index: /trunk/src/game/AggressorAI.cpp =================================================================== --- /trunk/src/game/AggressorAI.cpp (revision 186) +++ /trunk/src/game/AggressorAI.cpp (revision 229) @@ -52,5 +52,5 @@ if( !i_creature.getVictim() && !i_creature.hasUnitState(UNIT_STAT_STUNNED) && i_creature.canAttack(u) && ( i_creature.IsHostileTo( u ) /*|| u->getVictim() && i_creature.IsFriendlyTo( u->getVictim() )*/ ) && - u->isInAccessablePlaceFor(&i_creature) ) + u->isInAccessiblePlaceFor(&i_creature) ) { float attackRadius = i_creature.GetAttackDistance(u); Index: /trunk/src/game/StatSystem.cpp =================================================================== --- /trunk/src/game/StatSystem.cpp (revision 136) +++ /trunk/src/game/StatSystem.cpp (revision 229) @@ -69,5 +69,5 @@ UpdateMaxPower(POWER_MANA); UpdateAllSpellCritChances(); - UpdateAttackPowerAndDamage(true); //SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT, only intelect currently + UpdateAttackPowerAndDamage(true); //SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT, only intellect currently UpdateArmor(); //SPELL_AURA_MOD_RESISTANCE_OF_INTELLECT_PERCENT, only armor currently break; @@ -385,5 +385,5 @@ weapon_maxdamage = lvl*1.25*att_speed; } - else if(!IsUseEquipedWeapon(attType==BASE_ATTACK)) //check if player not in form but still can't use weapon (broken/etc) + else if(!IsUseEquippedWeapon(attType==BASE_ATTACK)) //check if player not in form but still can't use weapon (broken/etc) { weapon_mindamage = BASE_MINDAMAGE; Index: /trunk/src/game/GMTicketMgr.h =================================================================== --- /trunk/src/game/GMTicketMgr.h (revision 207) +++ /trunk/src/game/GMTicketMgr.h (revision 229) Index: /trunk/src/game/Unit.h =================================================================== --- /trunk/src/game/Unit.h (revision 226) +++ /trunk/src/game/Unit.h (revision 229) @@ -214,5 +214,5 @@ HITINFO_MISS = 0x00000010, HITINFO_ABSORB = 0x00000020, // plays absorb sound - HITINFO_RESIST = 0x00000040, // resisted atleast some damage + HITINFO_RESIST = 0x00000040, // resisted at least some damage HITINFO_CRITICALHIT = 0x00000080, HITINFO_UNK2 = 0x00000100, // wotlk? @@ -928,15 +928,15 @@ virtual bool IsInWater() const; virtual bool IsUnderWater() const; - bool isInAccessablePlaceFor(Creature const* c) const; + bool isInAccessiblePlaceFor(Creature const* c) const; void SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, bool critical = false); void SendEnergizeSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage,Powers powertype, bool critical = false); uint32 SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage, bool isTriggeredSpell = false, bool useSpellDamage = true); - void CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem = NULL, Aura* triggredByAura = NULL, uint64 originalCaster = 0); - void CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, Item *castItem= NULL, Aura* triggredByAura = NULL, uint64 originalCaster = 0); - void CastCustomSpell(Unit* Victim, uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem= NULL, Aura* triggredByAura = NULL, uint64 originalCaster = 0); - void CastCustomSpell(Unit* Victim,SpellEntry const *spellInfo, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem= NULL, Aura* triggredByAura = NULL, uint64 originalCaster = 0); - void CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem = NULL, Aura* triggredByAura = NULL, uint64 originalCaster = 0); - void CastSpell(float x, float y, float z, SpellEntry const *spellInfo, bool triggered, Item *castItem = NULL, Aura* triggredByAura = NULL, uint64 originalCaster = 0); + void CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem = NULL, Aura* triggeredByAura = NULL, uint64 originalCaster = 0); + void CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, Item *castItem= NULL, Aura* triggeredByAura = NULL, uint64 originalCaster = 0); + void CastCustomSpell(Unit* Victim, uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem= NULL, Aura* triggeredByAura = NULL, uint64 originalCaster = 0); + void CastCustomSpell(Unit* Victim,SpellEntry const *spellInfo, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem= NULL, Aura* triggeredByAura = NULL, uint64 originalCaster = 0); + void CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem = NULL, Aura* triggeredByAura = NULL, uint64 originalCaster = 0); + void CastSpell(float x, float y, float z, SpellEntry const *spellInfo, bool triggered, Item *castItem = NULL, Aura* triggeredByAura = NULL, uint64 originalCaster = 0); bool IsDamageToThreatSpell(SpellEntry const * spellInfo) const; @@ -1363,8 +1363,8 @@ void ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag, AuraTypeSet const& procAuraTypes, WeaponAttackType attType, SpellEntry const * procSpell, uint32 damage, SpellSchoolMask damageSchoolMask ); - bool HandleDummyAuraProc(Unit *pVictim, SpellEntry const *spellProto, uint32 effIndex, uint32 damage, Aura* triggredByAura, SpellEntry const * procSpell, uint32 procFlag,uint32 cooldown); - bool HandleProcTriggerSpell(Unit *pVictim,uint32 damage, Aura* triggredByAura, SpellEntry const *procSpell, uint32 procFlags,WeaponAttackType attType,uint32 cooldown); - bool HandleHasteAuraProc(Unit *pVictim, SpellEntry const *spellProto, uint32 effIndex, uint32 damage, Aura* triggredByAura, SpellEntry const * procSpell, uint32 procFlag,uint32 cooldown); - bool HandleOverrideClassScriptAuraProc(Unit *pVictim, int32 scriptId, uint32 damage, Aura* triggredByAura, SpellEntry const *procSpell,uint32 cooldown); + bool HandleDummyAuraProc(Unit *pVictim, SpellEntry const *spellProto, uint32 effIndex, uint32 damage, Aura* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag,uint32 cooldown); + bool HandleProcTriggerSpell(Unit *pVictim,uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell, uint32 procFlags,WeaponAttackType attType,uint32 cooldown); + bool HandleHasteAuraProc(Unit *pVictim, SpellEntry const *spellProto, uint32 effIndex, uint32 damage, Aura* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag,uint32 cooldown); + bool HandleOverrideClassScriptAuraProc(Unit *pVictim, int32 scriptId, uint32 damage, Aura* triggeredByAura, SpellEntry const *procSpell,uint32 cooldown); uint32 m_state; // Even derived shouldn't modify Index: /trunk/src/game/TaxiHandler.cpp =================================================================== --- /trunk/src/game/TaxiHandler.cpp (revision 102) +++ /trunk/src/game/TaxiHandler.cpp (revision 229) @@ -202,5 +202,5 @@ // 1) end taxi path in far (multi-node) flight // 2) switch from one map to other in case multim-map taxi path - // we need proccess only (1) + // we need process only (1) uint32 curDest = GetPlayer()->m_taxi.GetTaxiDestination(); if(!curDest) Index: /trunk/src/game/World.cpp =================================================================== --- /trunk/src/game/World.cpp (revision 207) +++ /trunk/src/game/World.cpp (revision 229) @@ -721,5 +721,5 @@ } - m_configs[CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY] = sConfig.GetBoolDefault("SaveRespawnTimeImmediately",true); + m_configs[CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY] = sConfig.GetBoolDefault("SaveRespawnTimeImmediately",true); m_configs[CONFIG_WEATHER] = sConfig.GetBoolDefault("ActivateWeather",true); @@ -2456,5 +2456,5 @@ SendServerMessage(msgid); - DEBUG_LOG("Server %s cancelled.",(m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown")); + DEBUG_LOG("Server %s canceled.",(m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown")); } Index: /trunk/src/game/WorldSession.cpp =================================================================== --- /trunk/src/game/WorldSession.cpp (revision 181) +++ /trunk/src/game/WorldSession.cpp (revision 229) @@ -486,5 +486,5 @@ void WorldSession::Handle_EarlyProccess( WorldPacket& recvPacket ) { - sLog.outError( "SESSION: received opcode %s (0x%.4X) that must be proccessed in WorldSocket::OnRead", + sLog.outError( "SESSION: received opcode %s (0x%.4X) that must be processed in WorldSocket::OnRead", LookupOpcodeName(recvPacket.GetOpcode()), recvPacket.GetOpcode()); Index: /trunk/src/game/Group.cpp =================================================================== --- /trunk/src/game/Group.cpp (revision 132) +++ /trunk/src/game/Group.cpp (revision 229) @@ -1463,5 +1463,5 @@ if(bind.save) { - // when a boss is killed or when copying the players's binds to the group + // when a boss is killed or when copying the player's binds to the group if(permanent != bind.perm || save != bind.save) if(!load) CharacterDatabase.PExecute("UPDATE group_instance SET instance = '%u', permanent = '%u' WHERE leaderGuid = '%u' AND instance = '%u'", save->GetInstanceId(), permanent, GUID_LOPART(GetLeaderGUID()), bind.save->GetInstanceId()); Index: /trunk/src/game/Guild.h =================================================================== --- /trunk/src/game/Guild.h (revision 177) +++ /trunk/src/game/Guild.h (revision 229) @@ -331,4 +331,16 @@ { return (members.find(LowGuid) != members.end()); + } + MemberSlot* GetMemberSlot(std::string const& name, uint64& guid) + { + for(MemberList::iterator itr = members.begin(); itr != members.end(); ++itr) + { + if(itr->second.name == name) + { + guid = itr->first; + return &itr->second; + } + } + return NULL; } Index: /trunk/src/game/SpellAuras.cpp =================================================================== --- /trunk/src/game/SpellAuras.cpp (revision 213) +++ /trunk/src/game/SpellAuras.cpp (revision 229) @@ -216,5 +216,5 @@ &Aura::HandleShieldBlockValue, //158 SPELL_AURA_MOD_SHIELD_BLOCKVALUE &Aura::HandleNoImmediateEffect, //159 SPELL_AURA_NO_PVP_CREDIT only for Honorless Target spell - &Aura::HandleNoImmediateEffect, //160 SPELL_AURA_MOD_AOE_AVOIDANCE implemended in Unit::MagicSpellHitResult + &Aura::HandleNoImmediateEffect, //160 SPELL_AURA_MOD_AOE_AVOIDANCE implemented in Unit::MagicSpellHitResult &Aura::HandleNoImmediateEffect, //161 SPELL_AURA_MOD_HEALTH_REGEN_IN_COMBAT &Aura::HandleAuraPowerBurn, //162 SPELL_AURA_POWER_BURN_MANA @@ -230,5 +230,5 @@ &Aura::HandleAuraModIncreaseMountedSpeed, //172 SPELL_AURA_MOD_MOUNTED_SPEED_NOT_STACK &Aura::HandleUnused, //173 SPELL_AURA_ALLOW_CHAMPION_SPELLS only for Proclaim Champion spell - &Aura::HandleModSpellDamagePercentFromStat, //174 SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT implemented in Unit::SpellBaseDamageBonus (by defeult intelect, dependent from SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT) + &Aura::HandleModSpellDamagePercentFromStat, //174 SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT implemented in Unit::SpellBaseDamageBonus (by default intellect, dependent from SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT) &Aura::HandleModSpellHealingPercentFromStat, //175 SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT implemented in Unit::SpellBaseHealingBonus &Aura::HandleSpiritOfRedemption, //176 SPELL_AURA_SPIRIT_OF_REDEMPTION only for Spirit of Redemption spell, die at aura end @@ -243,5 +243,5 @@ &Aura::HandleNoImmediateEffect, //185 SPELL_AURA_MOD_ATTACKER_RANGED_HIT_CHANCE implemented in Unit::RollMeleeOutcomeAgainst &Aura::HandleNoImmediateEffect, //186 SPELL_AURA_MOD_ATTACKER_SPELL_HIT_CHANCE implemented in Unit::MagicSpellHitResult - &Aura::HandleNoImmediateEffect, //187 SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_CHANCE implemended in Unit::GetUnitCriticalChance + &Aura::HandleNoImmediateEffect, //187 SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_CHANCE implemented in Unit::GetUnitCriticalChance &Aura::HandleNoImmediateEffect, //188 SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_CHANCE implemented in Unit::GetUnitCriticalChance &Aura::HandleModRating, //189 SPELL_AURA_MOD_RATING @@ -1055,5 +1055,5 @@ } } - else if(sameaura) // decrease count for spell, only for same aura effect, or this spell auras in remove proccess. + else if(sameaura) // decrease count for spell, only for same aura effect, or this spell auras in remove process. UpdateSlotCounterAndDuration(false); } @@ -1205,10 +1205,10 @@ uint64 originalCasterGUID = GetCasterGUID(); - SpellEntry const *triggredSpellInfo = sSpellStore.LookupEntry(trigger_spell_id); + SpellEntry const *triggeredSpellInfo = sSpellStore.LookupEntry(trigger_spell_id); SpellEntry const *auraSpellInfo = GetSpellProto(); uint32 auraId = auraSpellInfo->Id; // specific code for cases with no trigger spell provided in field - if (triggredSpellInfo == NULL) + if (triggeredSpellInfo == NULL) { switch(auraSpellInfo->SpellFamilyName) @@ -1218,5 +1218,5 @@ switch(auraId) { - // Firestone Passive (1-5 rangs) + // Firestone Passive (1-5 ranks) case 758: case 17945: @@ -1252,5 +1252,5 @@ // // Polymorphic Ray // case 6965: break; -// // Fire Nova (1-7 Rangs) +// // Fire Nova (1-7 ranks) // case 8350: // case 8508: @@ -1824,6 +1824,6 @@ } // Reget trigger spell proto - triggredSpellInfo = sSpellStore.LookupEntry(trigger_spell_id); - if(triggredSpellInfo == NULL) + triggeredSpellInfo = sSpellStore.LookupEntry(trigger_spell_id); + if(triggeredSpellInfo == NULL) { sLog.outError("Aura::TriggerSpell: Spell %u have 0 in EffectTriggered[%d], not handled custom case?",GetId(),GetEffIndex()); @@ -1833,5 +1833,5 @@ else { - // Spell exist but require costum code + // Spell exist but require custom code switch(auraId) { @@ -1843,5 +1843,5 @@ // 1) target show casting at each triggered cast: target don't must show casting animation for any triggered spell // but must show affect apply like item casting - // 2) maybe aura must be replace by new with accumulative stat mods insteed stacking + // 2) maybe aura must be replace by new with accumulative stat mods instead stacking // prevent cast by triggered auras @@ -1850,5 +1850,5 @@ // stop triggering after each affected stats lost > 90 - int32 intelectLoss = 0; + int32 intellectLoss = 0; int32 spiritLoss = 0; @@ -1860,5 +1860,5 @@ switch((*i)->GetModifier()->m_miscvalue) { - case STAT_INTELLECT: intelectLoss += (*i)->GetModifier()->m_amount; break; + case STAT_INTELLECT: intellectLoss += (*i)->GetModifier()->m_amount; break; case STAT_SPIRIT: spiritLoss += (*i)->GetModifier()->m_amount; break; default: break; @@ -1867,5 +1867,5 @@ } - if(intelectLoss <= -90 && spiritLoss <= -90) + if(intellectLoss <= -90 && spiritLoss <= -90) return; @@ -1882,7 +1882,7 @@ } } - m_target->CastSpell(target, triggredSpellInfo, true, 0, this, originalCasterGUID); + m_target->CastSpell(target, triggeredSpellInfo, true, 0, this, originalCasterGUID); /*// All ok cast by default case - Spell *spell = new Spell(m_target, triggredSpellInfo, true, originalCasterGUID ); + Spell *spell = new Spell(m_target, triggeredSpellInfo, true, originalCasterGUID ); SpellCastTargets targets; @@ -2009,5 +2009,5 @@ if(GetId()==45934) { - // Kill target if dispeled + // Kill target if dispelled if (m_removeMode==AURA_REMOVE_BY_DISPEL) m_target->DealDamage(m_target, m_target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -2566,5 +2566,6 @@ else { - m_target->SetDisplayId(m_target->GetNativeDisplayId()); + if(modelid > 0) + m_target->SetDisplayId(m_target->GetNativeDisplayId()); m_target->SetByteValue(UNIT_FIELD_BYTES_2, 3, FORM_NONE); if(m_target->getClass() == CLASS_DRUID) @@ -2717,5 +2718,5 @@ for(Unit::AuraList::const_iterator i = otherTransforms.begin();i != otherTransforms.end(); ++i) { - // negative auras are prefered + // negative auras are preferred if(!IsPositiveSpell((*i)->GetSpellProto()->Id)) { @@ -3117,5 +3118,5 @@ return; - // main-hand attack speed already set to special value for feral form already and don't must chnage and reset at remove. + // main-hand attack speed already set to special value for feral form already and don't must change and reset at remove. if (((Player *)m_target)->IsInFeralForm()) return; @@ -3439,5 +3440,5 @@ { uint32 state = currentSpell->getState(); - // Stop spells on prepere or casting state + // Stop spells on prepare or casting state if ( state == SPELL_STATE_PREPARING || state == SPELL_STATE_CASTING ) { @@ -4012,5 +4013,5 @@ float mwb_min = caster->GetWeaponDamageRange(BASE_ATTACK,MINDAMAGE); float mwb_max = caster->GetWeaponDamageRange(BASE_ATTACK,MAXDAMAGE); - // WARNING! in 3.0 multipler 0.00743f change to 0.6 + // WARNING! in 3.0 multiplier 0.00743f change to 0.6 m_modifier.m_amount+=int32(((mwb_min+mwb_max)/2+ap*mws/14000)*0.00743f); } @@ -4040,5 +4041,5 @@ if (m_spellProto->SpellFamilyFlags & 0x000000000000800000LL) { - // $AP * min(0.06*$cp, 0.24)/6 [Yes, there is no difference, wheather 4 or 5 CPs are being used] + // $AP * min(0.06*$cp, 0.24)/6 [Yes, there is no difference, whether 4 or 5 CPs are being used] if (apply && !loading && caster && caster->GetTypeId() == TYPEID_PLAYER) { @@ -4093,5 +4094,5 @@ if (m_spellProto->SpellFamilyFlags & 0x000000000000100000LL) { - // Dmg/tick = $AP*min(0.01*$cp, 0.03) [Like Rip: only the first three CP inrease the contribution from AP] + // Dmg/tick = $AP*min(0.01*$cp, 0.03) [Like Rip: only the first three CP increase the contribution from AP] if (apply && !loading && caster && caster->GetTypeId() == TYPEID_PLAYER) { @@ -4423,7 +4424,7 @@ if(m_modifier.m_miscvalue != SPELL_SCHOOL_MASK_NORMAL) { - // support required adding replace UpdateArmor by loop by UpdateResistence at intelect update + // support required adding replace UpdateArmor by loop by UpdateResistence at intellect update // and include in UpdateResistence same code as in UpdateArmor for aura mod apply. - sLog.outError("Aura SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT(182) need adding support for non-armor resistences!"); + sLog.outError("Aura SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT(182) need adding support for non-armor resistances!"); return; } @@ -4888,5 +4889,5 @@ { // support required adding UpdateAttackPowerAndDamage calls at stat update - sLog.outError("Aura SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT (212) need support non-intelect stats!"); + sLog.outError("Aura SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT (212) need support non-intellect stats!"); return; } Index: /trunk/src/game/Mail.cpp =================================================================== --- /trunk/src/game/Mail.cpp (revision 149) +++ /trunk/src/game/Mail.cpp (revision 229) @@ -376,5 +376,5 @@ } - // preper mail and send in other case + // prepare mail and send in other case bool needItemDelay = false; @@ -468,5 +468,5 @@ sender_accId = objmgr.GetPlayerAccountIdByGUID(sender_guid); - // check player existanse + // check player existence if(receive || sender_accId) { Index: /trunk/src/game/SharedDefines.h =================================================================== --- /trunk/src/game/SharedDefines.h (revision 226) +++ /trunk/src/game/SharedDefines.h (revision 229) @@ -200,5 +200,5 @@ #define SPELL_ATTR_UNK0 0x00000001 // 0 -#define SPELL_ATTR_RANGED 0x00000002 // 1 All ranged abilites have this flag +#define SPELL_ATTR_RANGED 0x00000002 // 1 All ranged abilities have this flag #define SPELL_ATTR_ON_NEXT_SWING_1 0x00000004 // 2 on next swing #define SPELL_ATTR_UNK3 0x00000008 // 3 not set in 2.4.2 @@ -737,5 +737,5 @@ (1< ALIVE promoting. + // Don't must be called, see Creature::setDeathState JUST_ALIVED -> ALIVE promoting. sLog.outError("Creature (GUIDLow: %u Entry: %u ) in wrong state: JUST_ALIVED (4)",GetGUIDLow(),GetEntry()); break; case JUST_DIED: - // Dont must be called, see Creature::setDeathState JUST_DIED -> CORPSE promoting. + // Don't must be called, see Creature::setDeathState JUST_DIED -> CORPSE promoting. sLog.outError("Creature (GUIDLow: %u Entry: %u ) in wrong state: JUST_DEAD (1)",GetGUIDLow(),GetEntry()); break; @@ -507,5 +507,5 @@ uint32 addvalue = 0; - // Not only pet, but any controelled creature + // Not only pet, but any controlled creature if(GetCharmerOrOwnerGUID()) { @@ -864,5 +864,5 @@ // in case non empty gossip menu (that not included quests list size) show it - // (quest entries from quest menu wiill be included in list) + // (quest entries from quest menu will be included in list) player->PlayerTalkClass->SendGossipMenu(GetNpcTextId(), GetGUID()); } @@ -1148,5 +1148,5 @@ { // this should only be used when the creature has already been loaded - // perferably after adding to map, because mapid may not be valid otherwise + // preferably after adding to map, because mapid may not be valid otherwise CreatureData const *data = objmgr.GetCreatureData(m_DBTableGuid); if(!data) @@ -1557,5 +1557,5 @@ float RetDistance = 20; - // "Aggro Radius varries with level difference at a rate of roughly 1 yard/level" + // "Aggro Radius varies with level difference at a rate of roughly 1 yard/level" // radius grow if playlevel < creaturelevel RetDistance -= (float)leveldif; @@ -1584,5 +1584,5 @@ // always save boss respawn time at death to prevent crash cheating - if(sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY) || isWorldBoss()) + if(sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY) || isWorldBoss()) SaveRespawnTime(); @@ -1876,5 +1876,5 @@ return true; - if(!pVictim->isInAccessablePlaceFor(this)) + if(!pVictim->isInAccessiblePlaceFor(this)) return true; @@ -1886,5 +1886,5 @@ uint32 ThreatRadius = sWorld.getConfig(CONFIG_THREAT_RADIUS); - //Use AttackDistance in distance check if threat radius is lower. This prevents creature bounce in and ouf of combat every update tick. + //Use AttackDistance in distance check if threat radius is lower. This prevents creature bounce in and out of combat every update tick. return ( length > (ThreatRadius > AttackDist ? ThreatRadius : AttackDist)); } @@ -1955,5 +1955,5 @@ } -/// Send a message to LocalDefense channel for players oposition team in the zone +/// Send a message to LocalDefense channel for players opposition team in the zone void Creature::SendZoneUnderAttackMessage(Player* attacker) { Index: /trunk/src/game/Map.cpp =================================================================== --- /trunk/src/game/Map.cpp (revision 221) +++ /trunk/src/game/Map.cpp (revision 229) @@ -678,5 +678,5 @@ { // if option set then object already saved at this moment - if(!sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY)) + if(!sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY)) obj->SaveRespawnTime(); DeleteFromWorld(obj); Index: /trunk/src/game/SpellAuraDefines.h =================================================================== --- /trunk/src/game/SpellAuraDefines.h (revision 102) +++ /trunk/src/game/SpellAuraDefines.h (revision 229) @@ -214,5 +214,5 @@ SPELL_AURA_MOD_MOUNTED_SPEED_NOT_STACK = 172, SPELL_AURA_ALLOW_CHAMPION_SPELLS = 173, - SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT = 174, // by defeult intelect, dependent from SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT + SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT = 174, // by default intellect, dependent from SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT = 175, SPELL_AURA_SPIRIT_OF_REDEMPTION = 176, Index: /trunk/src/game/Guild.cpp =================================================================== --- /trunk/src/game/Guild.cpp (revision 173) +++ /trunk/src/game/Guild.cpp (revision 229) @@ -1929,5 +1929,5 @@ } - // not specific slot or have spece for partly store only in specific slot + // not specific slot or have space for partly store only in specific slot // search stack in tab for merge to Index: /trunk/src/game/GMTicketMgr.cpp =================================================================== --- /trunk/src/game/GMTicketMgr.cpp (revision 207) +++ /trunk/src/game/GMTicketMgr.cpp (revision 229) @@ -46,5 +46,5 @@ sLog.outString(); - sLog.outErrorDb(">> Loaded `character_ticket`, table is empty!"); + sLog.outString(">> Loaded `character_ticket`, table is empty."); return; } Index: /trunk/src/game/MovementHandler.cpp =================================================================== --- /trunk/src/game/MovementHandler.cpp (revision 189) +++ /trunk/src/game/MovementHandler.cpp (revision 229) @@ -141,5 +141,5 @@ _player->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED); - // battleground state preper + // battleground state prepare // only add to bg group and object, if the player was invited (else he entered through command) if(_player->InBattleGround() && _player->IsInvitedForBattleGroundInstance(_player->GetBattleGroundId())) Index: /trunk/src/game/ItemHandler.cpp =================================================================== --- /trunk/src/game/ItemHandler.cpp (revision 207) +++ /trunk/src/game/ItemHandler.cpp (revision 229) @@ -556,5 +556,5 @@ else { - // prevent sell more items that exist in stack (possable only not from client) + // prevent sell more items that exist in stack (possible only not from client) if(count > pItem->GetCount()) { @@ -1028,5 +1028,5 @@ } - if(item==gift) // not possable with pacjket from real client + if(item==gift) // not possible with pacjket from real client { _player->SendEquipError( EQUIP_ERR_WRAPPED_CANT_BE_WRAPPED, item, NULL ); Index: /trunk/src/game/GuardAI.cpp =================================================================== --- /trunk/src/game/GuardAI.cpp (revision 186) +++ /trunk/src/game/GuardAI.cpp (revision 229) @@ -46,5 +46,5 @@ if( !i_creature.getVictim() && i_creature.canAttack(u) && ( u->IsHostileToPlayers() || i_creature.IsHostileTo(u) /*|| u->getVictim() && i_creature.IsFriendlyTo(u->getVictim())*/ ) && - u->isInAccessablePlaceFor(&i_creature)) + u->isInAccessiblePlaceFor(&i_creature)) { float attackRadius = i_creature.GetAttackDistance(u); Index: /trunk/src/game/OutdoorPvP.cpp =================================================================== --- /trunk/src/game/OutdoorPvP.cpp (revision 102) +++ /trunk/src/game/OutdoorPvP.cpp (revision 229) @@ -322,5 +322,5 @@ sLog.outDebug("deleting opvp creature type %u",type); uint32 guid = cr->GetDBTableGUIDLow(); - // dont save respawn time + // Don't save respawn time cr->SetRespawnTime(0); cr->RemoveCorpse(); @@ -380,5 +380,5 @@ { uint32 guid = cr->GetDBTableGUIDLow(); - // dont save respawn time + // Don't save respawn time cr->SetRespawnTime(0); cr->RemoveCorpse(); Index: /trunk/src/game/Player.h =================================================================== --- /trunk/src/game/Player.h (revision 221) +++ /trunk/src/game/Player.h (revision 229) @@ -786,5 +786,5 @@ /// Type of environmental damages -enum EnviromentalDamage +enum EnvironmentalDamageType { DAMAGE_EXHAUSTED = 0, @@ -1124,5 +1124,5 @@ uint32 GetArmorProficiency() const { return m_ArmorProficiency; } bool IsInFeralForm() const { return m_form == FORM_CAT || m_form == FORM_BEAR || m_form == FORM_DIREBEAR; } - bool IsUseEquipedWeapon( bool mainhand ) const + bool IsUseEquippedWeapon( bool mainhand ) const { // disarm applied only to mainhand weapon @@ -1934,8 +1934,8 @@ /*********************************************************/ - /*** ENVIROMENTAL SYSTEM ***/ - /*********************************************************/ - - void EnvironmentalDamage(uint64 guid, EnviromentalDamage type, uint32 damage); + /*** ENVIRONMENTAL SYSTEM ***/ + /*********************************************************/ + + void EnvironmentalDamage(uint64 guid, EnvironmentalDamageType type, uint32 damage); /*********************************************************/ Index: /trunk/src/game/GMTicketHandler.cpp =================================================================== --- /trunk/src/game/GMTicketHandler.cpp (revision 208) +++ /trunk/src/game/GMTicketHandler.cpp (revision 229) Index: /trunk/src/game/SpellMgr.h =================================================================== --- /trunk/src/game/SpellMgr.h (revision 219) +++ /trunk/src/game/SpellMgr.h (revision 229) @@ -429,5 +429,5 @@ inline uint32 GetDispellMask(DispelType dispel) { - // If dispell all + // If dispel all if (dispel == DISPEL_ALL) return DISPEL_ALL_MASK; Index: /trunk/src/game/WorldSocket.cpp =================================================================== --- /trunk/src/game/WorldSocket.cpp (revision 181) +++ /trunk/src/game/WorldSocket.cpp (revision 229) @@ -264,5 +264,5 @@ (errno == EAGAIN)) { - return Update (); // interesting line ,isnt it ? + return Update (); // interesting line ,isn't it ? } @@ -470,5 +470,5 @@ if (m_Header.space () > 0) { - //couldnt recieve the whole header this time + //couldn't recieve the whole header this time ACE_ASSERT (message_block.length () == 0); errno = EWOULDBLOCK; @@ -504,5 +504,5 @@ if (m_RecvPct.space () > 0) { - //couldnt recieve the whole data this time + //couldn't recieve the whole data this time ACE_ASSERT (message_block.length () == 0); errno = EWOULDBLOCK; Index: /trunk/src/game/MiscHandler.cpp =================================================================== --- /trunk/src/game/MiscHandler.cpp (revision 209) +++ /trunk/src/game/MiscHandler.cpp (revision 229) @@ -259,5 +259,5 @@ data << uint32( pzoneid ); // player zone id - // 49 is maximum player count sent to client - can be overriden + // 49 is maximum player count sent to client - can be overridden // through config, but is unstable if ((++clientcount) == sWorld.getConfig(CONFIG_MAX_WHO)) @@ -1281,4 +1281,6 @@ } + normalizePlayerName (charname); + Player *plr = objmgr.GetPlayer(charname.c_str()); Index: /trunk/src/game/World.h =================================================================== --- /trunk/src/game/World.h (revision 206) +++ /trunk/src/game/World.h (revision 229) @@ -133,5 +133,5 @@ CONFIG_SKILL_GAIN_WEAPON, CONFIG_MAX_OVERSPEED_PINGS, - CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY, + CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY, CONFIG_WEATHER, CONFIG_EXPANSION, Index: /trunk/src/game/GameObject.cpp =================================================================== --- /trunk/src/game/GameObject.cpp (revision 203) +++ /trunk/src/game/GameObject.cpp (revision 229) @@ -66,5 +66,5 @@ if(m_uint32Values) // field array can be not exist if GameOBject not loaded { - // crash possable at access to deleted GO in Unit::m_gameobj + // crash possible at access to deleted GO in Unit::m_gameobj uint64 owner_guid = GetOwnerGUID(); if(owner_guid) @@ -74,5 +74,5 @@ owner->RemoveGameObject(this,false); else if(!IS_PLAYER_GUID(owner_guid)) - sLog.outError("Delete GameObject (GUID: %u Entry: %u ) that have references in not found creature %u GO list. Crash possable later.",GetGUIDLow(),GetGOInfo()->id,GUID_LOPART(owner_guid)); + sLog.outError("Delete GameObject (GUID: %u Entry: %u ) that have references in not found creature %u GO list. Crash possible later.",GetGUIDLow(),GetGOInfo()->id,GUID_LOPART(owner_guid)); } } @@ -210,5 +210,5 @@ } - m_lootState = GO_READY; // can be succesfully open with some chance + m_lootState = GO_READY; // can be successfully open with some chance } return; @@ -287,5 +287,5 @@ if(!radius) { - if(goInfo->trap.cooldown != 3) // cast in other case (at some triggring/linked go/etc explicit call) + if(goInfo->trap.cooldown != 3) // cast in other case (at some triggering/linked go/etc explicit call) return; else @@ -434,5 +434,5 @@ // if option not set then object will be saved at grid unload - if(sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY)) + if(sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY)) SaveRespawnTime(); @@ -487,5 +487,5 @@ { // this should only be used when the gameobject has already been loaded - // perferably after adding to map, because mapid may not be valid otherwise + // preferably after adding to map, because mapid may not be valid otherwise GameObjectData const *data = objmgr.GetGOData(m_DBTableGuid); if(!data) Index: /trunk/src/game/Unit.cpp =================================================================== --- /trunk/src/game/Unit.cpp (revision 226) +++ /trunk/src/game/Unit.cpp (revision 229) @@ -388,8 +388,13 @@ WorldPacket data( SMSG_MONSTER_MOVE, (GetPackGUID().size()+4+4+4+4+1+4+4+4+pathSize*4*3) ); data.append(GetPackGUID()); - data << GetPositionX( ) - << GetPositionY( ) - << GetPositionZ( ); - data << GetOrientation( ); + data << GetPositionX(); + data << GetPositionY(); + data << GetPositionZ(); + + // unknown field - unrelated to orientation + // seems to increment about 1000 for every 1.7 seconds + // for now, we'll just use mstime + data << getMSTime(); + data << uint8( 0 ); data << uint32( MovementFlags ); @@ -869,5 +874,5 @@ if(getVictim()) { - // if have target and damage pVictim just call AI recation + // if have target and damage pVictim just call AI reaction if(pVictim != getVictim() && pVictim->GetTypeId()==TYPEID_UNIT && ((Creature*)pVictim)->AI()) ((Creature*)pVictim)->AI()->AttackedBy(this); @@ -983,5 +988,5 @@ } -void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem, Aura* triggredByAura, uint64 originalCaster) +void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem, Aura* triggeredByAura, uint64 originalCaster) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId ); @@ -993,8 +998,8 @@ } - CastSpell(Victim,spellInfo,triggered,castItem,triggredByAura, originalCaster); -} - -void Unit::CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, Item *castItem, Aura* triggredByAura, uint64 originalCaster) + CastSpell(Victim,spellInfo,triggered,castItem,triggeredByAura, originalCaster); +} + +void Unit::CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, Item *castItem, Aura* triggeredByAura, uint64 originalCaster) { assert(Victim); @@ -1008,6 +1013,6 @@ DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id); - if(!originalCaster && triggredByAura) - originalCaster = triggredByAura->GetCasterGUID(); + if(!originalCaster && triggeredByAura) + originalCaster = triggeredByAura->GetCasterGUID(); Spell *spell = new Spell(this, spellInfo, triggered, originalCaster ); @@ -1017,8 +1022,8 @@ targets.setDestination( Victim->GetPositionX(), Victim->GetPositionY(), Victim->GetPositionZ(), false); spell->m_CastItem = castItem; - spell->prepare(&targets, triggredByAura); -} - -void Unit::CastCustomSpell(Unit* Victim,uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, Aura* triggredByAura, uint64 originalCaster) + spell->prepare(&targets, triggeredByAura); +} + +void Unit::CastCustomSpell(Unit* Victim,uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, Aura* triggeredByAura, uint64 originalCaster) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId ); @@ -1030,8 +1035,8 @@ } - CastCustomSpell(Victim,spellInfo,bp0,bp1,bp2,triggered,castItem,triggredByAura, originalCaster); -} - -void Unit::CastCustomSpell(Unit* Victim,SpellEntry const *spellInfo, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, Aura* triggredByAura, uint64 originalCaster) + CastCustomSpell(Victim,spellInfo,bp0,bp1,bp2,triggered,castItem,triggeredByAura, originalCaster); +} + +void Unit::CastCustomSpell(Unit* Victim,SpellEntry const *spellInfo, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, Aura* triggeredByAura, uint64 originalCaster) { if(!spellInfo) @@ -1044,6 +1049,6 @@ DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id); - if(!originalCaster && triggredByAura) - originalCaster = triggredByAura->GetCasterGUID(); + if(!originalCaster && triggeredByAura) + originalCaster = triggeredByAura->GetCasterGUID(); Spell *spell = new Spell(this, spellInfo, triggered, originalCaster); @@ -1061,9 +1066,9 @@ targets.setUnitTarget( Victim ); spell->m_CastItem = castItem; - spell->prepare(&targets, triggredByAura); + spell->prepare(&targets, triggeredByAura); } // used for scripting -void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem, Aura* triggredByAura, uint64 originalCaster) +void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem, Aura* triggeredByAura, uint64 originalCaster) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId ); @@ -1075,9 +1080,9 @@ } - CastSpell(x, y, z,spellInfo,triggered,castItem,triggredByAura, originalCaster); + CastSpell(x, y, z,spellInfo,triggered,castItem,triggeredByAura, originalCaster); } // used for scripting -void Unit::CastSpell(float x, float y, float z, SpellEntry const *spellInfo, bool triggered, Item *castItem, Aura* triggredByAura, uint64 originalCaster) +void Unit::CastSpell(float x, float y, float z, SpellEntry const *spellInfo, bool triggered, Item *castItem, Aura* triggeredByAura, uint64 originalCaster) { if(!spellInfo) @@ -1090,6 +1095,6 @@ DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id); - if(!originalCaster && triggredByAura) - originalCaster = triggredByAura->GetCasterGUID(); + if(!originalCaster && triggeredByAura) + originalCaster = triggeredByAura->GetCasterGUID(); Spell *spell = new Spell(this, spellInfo, triggered, originalCaster ); @@ -1098,5 +1103,5 @@ targets.setDestination(x, y, z); spell->m_CastItem = castItem; - spell->prepare(&targets, triggredByAura); + spell->prepare(&targets, triggeredByAura); } @@ -1106,5 +1111,5 @@ DEBUG_LOG("DealFlatDamage (BEFORE) >> DMG:%u", *damage); - // Per-damage calss calculation + // Per-damage class calculation switch (spellInfo->DmgClass) { @@ -1712,5 +1717,5 @@ } - // only split damage if not damaing yourself + // only split damage if not damaging yourself if(pVictim != this) { @@ -2192,5 +2197,5 @@ hitInfo = HITINFO_LEFTSWING; else - return; // ignore ranaged case + return; // ignore ranged case uint32 extraAttacks = m_extraAttacks; @@ -2306,5 +2311,5 @@ else { - // parry can be avoided only by some abilites + // parry can be avoided only by some abilities parry_chance = pVictim->GetUnitParryChance(); // block might be bypassed by it as well @@ -2320,5 +2325,5 @@ crit_chance += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_SPELL_CRIT_CHANCE_SCHOOL, spellInfo->SchoolMask); - if( dodge_chance != 0.0f ) // if dodge chance is already 0, ignore talents fpr speed + if( dodge_chance != 0.0f ) // if dodge chance is already 0, ignore talents for speed { AuraList const& mCanNotBeDodge = GetAurasByType(SPELL_AURA_IGNORE_COMBAT_RESULT); @@ -2886,5 +2891,5 @@ // TODO need use this code for spell hit result calculation - // now code commented for compotability + // now code commented for computability switch (spell->DmgClass) { @@ -3058,5 +3063,5 @@ return GetFloatValue(PLAYER_BLOCK_PERCENTAGE); } - // is player but has no block ability or no not broken shield equiped + // is player but has no block ability or no not broken shield equipped return 0.0f; } @@ -3139,5 +3144,5 @@ return GetMaxSkillValueForLevel(); // always maximized SKILL_FERAL_COMBAT in fact - // weaon skill or (unarmed for base attack) + // weapon skill or (unarmed for base attack) uint32 skill = item ? item->GetSkill() : SKILL_UNARMED; @@ -3457,5 +3462,5 @@ } -bool Unit::isInAccessablePlaceFor(Creature const* c) const +bool Unit::isInAccessiblePlaceFor(Creature const* c) const { if(IsInWater()) @@ -3493,11 +3498,11 @@ float Unit::GetTotalAuraMultiplier(AuraType auratype) const { - float multipler = 1.0f; + float multiplier = 1.0f; AuraList const& mTotalAuraList = GetAurasByType(auratype); for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i) - multipler *= (100.0f + (*i)->GetModifier()->m_amount)/100.0f; - - return multipler; + multiplier *= (100.0f + (*i)->GetModifier()->m_amount)/100.0f; + + return multiplier; } @@ -3542,5 +3547,5 @@ float Unit::GetTotalAuraMultiplierByMiscMask(AuraType auratype, uint32 misc_mask) const { - float multipler = 1.0f; + float multiplier = 1.0f; AuraList const& mTotalAuraList = GetAurasByType(auratype); @@ -3549,7 +3554,7 @@ Modifier* mod = (*i)->GetModifier(); if (mod->m_miscvalue & misc_mask) - multipler *= (100.0f + mod->m_amount)/100.0f; - } - return multipler; + multiplier *= (100.0f + mod->m_amount)/100.0f; + } + return multiplier; } @@ -3600,5 +3605,5 @@ float Unit::GetTotalAuraMultiplierByMiscValue(AuraType auratype, int32 misc_value) const { - float multipler = 1.0f; + float multiplier = 1.0f; AuraList const& mTotalAuraList = GetAurasByType(auratype); @@ -3607,7 +3612,7 @@ Modifier* mod = (*i)->GetModifier(); if (mod->m_miscvalue == misc_value) - multipler *= (100.0f + mod->m_amount)/100.0f; - } - return multipler; + multiplier *= (100.0f + mod->m_amount)/100.0f; + } + return multiplier; } @@ -3725,5 +3730,5 @@ { delete Aur; - return false; // couldnt remove conflicting aura with higher rank + return false; // couldn't remove conflicting aura with higher rank } } @@ -3867,5 +3872,5 @@ { // prevent remove dummy triggered spells at next effect aura add - switch(spellProto->Effect[j]) // main spell auras added added after triggred spell + switch(spellProto->Effect[j]) // main spell auras added added after triggered spell { case SPELL_EFFECT_DUMMY: @@ -3880,5 +3885,5 @@ break; - // prevent remove form main spell by triggred passive spells + // prevent remove form main spell by triggered passive spells switch(i_spellProto->EffectApplyAuraName[j]) // main aura added before triggered spell { @@ -4049,5 +4054,5 @@ // Create dispel mask by dispel type uint32 dispelMask = GetDispellMask(type); - // Dispel all existing auras vs current dispell type + // Dispel all existing auras vs current dispel type AuraMap& auras = GetAuras(); for(AuraMap::iterator itr = auras.begin(); itr != auras.end(); ) @@ -4482,5 +4487,5 @@ // Assign melee/ranged proc flags for magic attacks, that are actually melee/ranged abilities - // not assign for spell proc triggered spell to prevent infinity (or unexpacted 2-3 times) melee damage spell proc call with melee damage effect + // not assign for spell proc triggered spell to prevent infinity (or unexpected 2-3 times) melee damage spell proc call with melee damage effect // That is the question though if it's fully correct if(procSpell && !isTriggeredSpell) @@ -4509,5 +4514,5 @@ if (procAttacker) { - // procces auras that not generate casts at proc event before auras that generate casts to prevent proc aura added at prev. proc aura execute in set + // processing auras that not generate casts at proc event before auras that generate casts to prevent proc aura added at prev. proc aura execute in set ProcDamageAndSpellFor(false,pVictim,procAttacker,attackerProcEffectAuraTypes,attType, procSpell, damage, damageSchoolMask); ProcDamageAndSpellFor(false,pVictim,procAttacker,attackerProcCastAuraTypes,attType, procSpell, damage, damageSchoolMask); @@ -4518,5 +4523,5 @@ if(pVictim && pVictim->isAlive() && procVictim) { - // procces auras that not generate casts at proc event before auras that generate casts to prevent proc aura added at prev. proc aura execute in set + // processing auras that not generate casts at proc event before auras that generate casts to prevent proc aura added at prev. proc aura execute in set pVictim->ProcDamageAndSpellFor(true,this,procVictim,victimProcEffectAuraTypes,attType,procSpell, damage, damageSchoolMask); pVictim->ProcDamageAndSpellFor(true,this,procVictim,victimProcCastAuraTypes,attType,procSpell, damage, damageSchoolMask); @@ -4707,5 +4712,5 @@ case 35429: { - // prevent chain of triggred spell from same triggred spell + // prevent chain of triggered spell from same triggered spell if(procSpell && procSpell->Id==26654) return false; @@ -5729,5 +5734,5 @@ uint32 spellId = 0; - // Every Lightning Bolt and Chain Lightning spell have dublicate vs half damage and zero cost + // Every Lightning Bolt and Chain Lightning spell have duplicate vs half damage and zero cost switch (procSpell->Id) { @@ -5772,5 +5777,5 @@ ((Player*)this)->RemoveSpellCooldown(spellId); - // Hmmm.. in most case spells alredy set half basepoints but... + // Hmmm.. in most case spells already set half basepoints but... // Lightning Bolt (2-10 rank) have full basepoint and half bonus from level // As on wiki: @@ -5990,5 +5995,5 @@ return false; - // custom chnace + // custom chance float chance = 0; switch (triggeredByAura->GetId()) @@ -7054,5 +7059,5 @@ if(!(*iter)->AttackStop()) { - sLog.outError("WORLD: Unit has an attacker that isnt attacking it!"); + sLog.outError("WORLD: Unit has an attacker that isn't attacking it!"); m_attackers.erase(iter); } @@ -8375,5 +8380,5 @@ { // normalized proc chance for weapon attack speed - // (odd formulae...) + // (odd formula...) if(isAttackReady(BASE_ATTACK)) return (GetAttackTime(BASE_ATTACK) * 1.8f / 1000.0f); @@ -9064,5 +9069,5 @@ Unit* target = NULL; - //This function only useful once AI has been initilazied + //This function only useful once AI has been initialized if (!((Creature*)this)->AI()) return false; @@ -9096,5 +9101,5 @@ for(AttackerSet::const_iterator itr = m_attackers.begin(); itr != m_attackers.end(); ++itr) { - if( (*itr)->IsInMap(this) && canAttack(*itr) && (*itr)->isInAccessablePlaceFor((Creature*)this) ) + if( (*itr)->IsInMap(this) && canAttack(*itr) && (*itr)->isInAccessiblePlaceFor((Creature*)this) ) return false; } @@ -9338,5 +9343,5 @@ if(unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END) { - sLog.outError("ERROR in HandleStatModifier(): nonexisted UnitMods or wrong UnitModifierType!"); + sLog.outError("ERROR in HandleStatModifier(): non existed UnitMods or wrong UnitModifierType!"); return false; } @@ -9408,5 +9413,5 @@ if( unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END) { - sLog.outError("ERROR: trial to access nonexisted modifier value from UnitMods!"); + sLog.outError("ERROR: trial to access non existed modifier value from UnitMods!"); return 0.0f; } @@ -9438,5 +9443,5 @@ if(unitMod >= UNIT_MOD_END) { - sLog.outError("ERROR: trial to access nonexisted UnitMods in GetTotalAuraModValue()!"); + sLog.outError("ERROR: trial to access non existed UnitMods in GetTotalAuraModValue()!"); return 0.0f; } @@ -9738,5 +9743,5 @@ { InterruptNonMeleeSpells(true); - m_Events.KillAllEvents(false); // non-delatable (currently casted spells) will not deleted ans will deleated at call in Map::RemoveAllObjectsInRemoveList + m_Events.KillAllEvents(false); // non-delatable (currently casted spells) will not deleted now but it will deleted at call in Map::RemoveAllObjectsInRemoveList CombatStop(); ClearComboPointHolders(); @@ -10048,5 +10053,5 @@ { sLog.outError("Spell aura %u (id:%u effect:%u) has been deleted before call spell proc event handler",*aur,i->triggeredByAura_SpellPair.first,i->triggeredByAura_SpellPair.second); - sLog.outError("It can be deleted one from early proccesed auras:"); + sLog.outError("It can be deleted one from early processed auras:"); for(ProcTriggeredList::iterator i2 = procTriggered.begin(); i != i2; ++i2) sLog.outError(" Spell aura %u (id:%u effect:%u)",*aur,i2->triggeredByAura_SpellPair.first,i2->triggeredByAura_SpellPair.second); @@ -10298,5 +10303,5 @@ // send explicit stop packet - // rely on vmaps here because for exemple stormwind is in air + // rely on vmaps here because for example stormwind is in air float z = MapManager::Instance().GetBaseMap(GetMapId())->GetHeight(GetPositionX(), GetPositionY(), GetPositionZ(), true); //if (fabs(GetPositionZ() - z) < 2.0f) Index: /trunk/src/game/ItemPrototype.h =================================================================== --- /trunk/src/game/ItemPrototype.h (revision 102) +++ /trunk/src/game/ItemPrototype.h (revision 229) @@ -79,5 +79,5 @@ NO_BIND = 0, BIND_WHEN_PICKED_UP = 1, - BIND_WHEN_EQUIPED = 2, + BIND_WHEN_EQUIPPED = 2, BIND_WHEN_USE = 3, BIND_QUEST_ITEM = 4, Index: /trunk/src/game/Player.cpp =================================================================== --- /trunk/src/game/Player.cpp (revision 221) +++ /trunk/src/game/Player.cpp (revision 229) @@ -798,5 +798,5 @@ } -void Player::EnvironmentalDamage(uint64 guid, EnviromentalDamage type, uint32 damage) +void Player::EnvironmentalDamage(uint64 guid, EnvironmentalDamageType type, uint32 damage) { WorldPacket data(SMSG_ENVIRONMENTALDAMAGELOG, (21)); @@ -1545,5 +1545,5 @@ ((Player*)GetCharmer())->RemovePossess(); - // The player was ported to another map and looses the duel immediatly. + // The player was ported to another map and looses the duel immediately. // We have to perform this check before the teleport, otherwise the // ObjectAccessor won't find the flag. @@ -6691,5 +6691,5 @@ } - if(!IsUseEquipedWeapon(slot==EQUIPMENT_SLOT_MAINHAND)) + if(!IsUseEquippedWeapon(slot==EQUIPMENT_SLOT_MAINHAND)) return; @@ -8469,5 +8469,5 @@ return item; - if( item->IsBroken() || !IsUseEquipedWeapon(attackType==BASE_ATTACK) ) + if( item->IsBroken() || !IsUseEquippedWeapon(attackType==BASE_ATTACK) ) return NULL; @@ -10139,5 +10139,5 @@ if( pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP || pItem->GetProto()->Bonding == BIND_QUEST_ITEM || - pItem->GetProto()->Bonding == BIND_WHEN_EQUIPED && IsBagPos(pos) ) + pItem->GetProto()->Bonding == BIND_WHEN_EQUIPPED && IsBagPos(pos) ) pItem->SetBinding( true ); @@ -10185,5 +10185,5 @@ if( pItem2->GetProto()->Bonding == BIND_WHEN_PICKED_UP || pItem2->GetProto()->Bonding == BIND_QUEST_ITEM || - pItem2->GetProto()->Bonding == BIND_WHEN_EQUIPED && IsBagPos(pos) ) + pItem2->GetProto()->Bonding == BIND_WHEN_EQUIPPED && IsBagPos(pos) ) pItem2->SetBinding( true ); @@ -10370,5 +10370,5 @@ // check also BIND_WHEN_PICKED_UP and BIND_QUEST_ITEM for .additem or .additemset case by GM (not binded at adding to inventory) - if( pItem->GetProto()->Bonding == BIND_WHEN_EQUIPED || pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP || pItem->GetProto()->Bonding == BIND_QUEST_ITEM ) + if( pItem->GetProto()->Bonding == BIND_WHEN_EQUIPPED || pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP || pItem->GetProto()->Bonding == BIND_QUEST_ITEM ) pItem->SetBinding( true ); @@ -17332,5 +17332,5 @@ if(u->GetVisibility() == VISIBILITY_GROUP_STEALTH) { - // if player is dead then he can't detect anyone in anycases + // if player is dead then he can't detect anyone in any cases //do not know what is the use of this detect // stealth and detected and visible for some seconds Index: /trunk/src/game/PetAI.cpp =================================================================== --- /trunk/src/game/PetAI.cpp (revision 191) +++ /trunk/src/game/PetAI.cpp (revision 229) @@ -50,5 +50,5 @@ i_pet.GetCharmInfo()->HasReactState(REACT_AGGRESSIVE) && i_pet.IsHostileTo( u ) && i_pet.canAttack(u) && - u->isInAccessablePlaceFor(&i_pet)) + u->isInAccessiblePlaceFor(&i_pet)) { float attackRadius = i_pet.GetAttackDistance(u); Index: /trunk/src/game/Spell.cpp =================================================================== --- /trunk/src/game/Spell.cpp (revision 228) +++ /trunk/src/game/Spell.cpp (revision 229) @@ -366,5 +366,5 @@ m_powerCost = 0; // setup to correct value in Spell::prepare, don't must be used before. m_casttime = 0; // setup to correct value in Spell::prepare, don't must be used before. - m_timer = 0; // will set to castime in preper + m_timer = 0; // will set to castime in prepare m_needAliveTargetMask = 0; @@ -1680,5 +1680,5 @@ TagUnitMap.push_back(target); }break; - // TARGET_SINGLE_PARTY means that the spells can only be casted on a party member and not on the caster (some sceals, fire shield from imp, etc..) + // TARGET_SINGLE_PARTY means that the spells can only be casted on a party member and not on the caster (some seals, fire shield from imp, etc..) case TARGET_SINGLE_PARTY: { Index: /trunk/src/game/LootMgr.cpp =================================================================== --- /trunk/src/game/LootMgr.cpp (revision 102) +++ /trunk/src/game/LootMgr.cpp (revision 229) @@ -535,5 +535,5 @@ // all players will get notified of it being removed // (other questitems can be looted by each group member) - // bit inefficient but isnt called often + // bit inefficient but isn't called often std::set::iterator i_next; Index: /trunk/src/game/ThreatManager.cpp =================================================================== --- /trunk/src/game/ThreatManager.cpp (revision 198) +++ /trunk/src/game/ThreatManager.cpp (revision 229) @@ -133,9 +133,9 @@ { Creature* creature = (Creature* ) getSourceUnit(); - online = getTarget()->isInAccessablePlaceFor(creature); + online = getTarget()->isInAccessiblePlaceFor(creature); if(!online) { if(creature->AI()->canReachByRangeAttack(getTarget())) - online = true; // not accessable but stays online + online = true; // not accessible but stays online } else @@ -156,5 +156,5 @@ iOnline = pIsOnline; if(!iOnline) - setAccessibleState(false); // if not online that not accessable as well + setAccessibleState(false); // if not online that not accessible as well fireStatusChanged(ThreatRefStatusChangeEvent(UEV_THREAT_REF_ONLINE_STATUS, this)); } @@ -279,5 +279,5 @@ assert(target); // if the ref has status online the target must be there ! - // some units are prefered in comparison to others + // some units are preferred in comparison to others if(iter != lastRef && (target->IsImmunedToDamage(pAttacker->GetMeleeDamageSchoolMask(), false) || target->hasUnitState(UNIT_STAT_CONFUSED | UNIT_STAT_FLEEING) Index: /trunk/src/game/GuildHandler.cpp =================================================================== --- /trunk/src/game/GuildHandler.cpp (revision 177) +++ /trunk/src/game/GuildHandler.cpp (revision 229) @@ -174,21 +174,15 @@ } - uint64 plGuid = objmgr.GetPlayerGUIDByName(plName); - - if(!plGuid) - { - SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_FOUND); - return; - } - - if(plGuid == guild->GetLeader()) + uint64 plGuid; + MemberSlot* slot = guild->GetMemberSlot(plName, plGuid); + if(!slot) + { + SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S); + return; + } + + if(slot->RankId == GR_GUILDMASTER) { SendGuildCommandResult(GUILD_QUIT_S, "", GUILD_LEADER_LEAVE); - return; - } - - if(!guild->IsMember(GUID_LOPART(plGuid))) - { - SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S); return; } @@ -302,27 +296,23 @@ } - uint64 plGuid = objmgr.GetPlayerGUIDByName(plName); + uint64 plGuid; + MemberSlot* slot = guild->GetMemberSlot(plName, plGuid); + + if(!slot) + { + SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S); + return; + } + + if(plGuid == GetPlayer()->GetGUID()) + { + SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_NAME_INVALID); + return; + } - if(!plGuid) - { - SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_FOUND); - return; - } - else if(plGuid == GetPlayer()->GetGUID()) - { - SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_NAME_INVALID); - return; - } - - int32 plRankId = guild->GetRank(GUID_LOPART(plGuid)); - if(plRankId == -1) - { - SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S); - return; - } - if(plRankId < 2 || (plRankId-1) < GetPlayer()->GetRank()) - return; - - uint32 newRankId = plRankId < guild->GetNrRanks() ? plRankId-1 : guild->GetNrRanks()-1; + if(slot->RankId < 2 || (slot->RankId-1) < GetPlayer()->GetRank()) + return; + + uint32 newRankId = slot->RankId < guild->GetNrRanks() ? slot->RankId-1 : guild->GetNrRanks()-1; guild->ChangeRank(plGuid, newRankId); @@ -366,9 +356,10 @@ } - uint64 plGuid = objmgr.GetPlayerGUIDByName(plName); - - if( !plGuid ) - { - SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_FOUND); + uint64 plGuid; + MemberSlot* slot = guild->GetMemberSlot(plName, plGuid); + + if (!slot) + { + SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S); return; } @@ -380,17 +371,10 @@ } - int32 plRankId = guild->GetRank(GUID_LOPART(plGuid)); - if(plRankId == -1) - { - SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S); - return; - } - - if((plRankId+1) >= guild->GetNrRanks() || plRankId <= this->GetPlayer()->GetRank()) - return; - - guild->ChangeRank(plGuid, (plRankId+1)); + if((slot->RankId+1) >= guild->GetNrRanks() || slot->RankId <= GetPlayer()->GetRank()) + return; + + guild->ChangeRank(plGuid, (slot->RankId+1)); // Put record into guildlog - guild->LogGuildEvent(GUILD_EVENT_LOG_DEMOTE_PLAYER, GetPlayer()->GetGUIDLow(), GUID_LOPART(plGuid), (plRankId+1)); + guild->LogGuildEvent(GUILD_EVENT_LOG_DEMOTE_PLAYER, GetPlayer()->GetGUIDLow(), GUID_LOPART(plGuid), (slot->RankId+1)); WorldPacket data(SMSG_GUILD_EVENT, (2+30)); // guess size @@ -399,5 +383,5 @@ data << GetPlayer()->GetName(); data << plName; - data << guild->GetRankName(plRankId+1); + data << guild->GetRankName(slot->RankId+1); guild->BroadcastPacket(&data); } @@ -498,11 +482,8 @@ } - uint64 newLeaderGUID = objmgr.GetPlayerGUIDByName(name); - if (!newLeaderGUID) - { - SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_FOUND); - return; - } - if(!guild->IsMember(GUID_LOPART(newLeaderGUID))) + uint64 newLeaderGUID; + MemberSlot* slot = guild->GetMemberSlot(name, newLeaderGUID); + + if (!slot) { SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_IN_GUILD_S); @@ -584,13 +565,8 @@ } - uint64 plGuid = objmgr.GetPlayerGUIDByName(name); - - if (!plGuid) - { - SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_FOUND); - return; - } - - if (!guild->IsMember(GUID_LOPART(plGuid))) + uint64 plGuid; + MemberSlot* slot = guild->GetMemberSlot(name, plGuid); + + if (!slot) { SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_IN_GUILD_S); @@ -629,13 +605,8 @@ } - uint64 plGuid = objmgr.GetPlayerGUIDByName(plName); - - if (!plGuid) - { - SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_FOUND); - return; - } + uint64 plGuid; + MemberSlot* slot = guild->GetMemberSlot(plName, plGuid); - if (!guild->IsMember(GUID_LOPART(plGuid))) + if (!slot) { SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S); Index: /trunk/src/game/ObjectGridLoader.cpp =================================================================== --- /trunk/src/game/ObjectGridLoader.cpp (revision 102) +++ /trunk/src/game/ObjectGridLoader.cpp (revision 229) @@ -256,5 +256,5 @@ T *obj = m.getFirst()->getSource(); // if option set then object already saved at this moment - if(!sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY)) + if(!sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY)) obj->SaveRespawnTime(); ///- object must be out of world before delete @@ -277,5 +277,5 @@ Creature *obj = m.getFirst()->getSource(); // if option set then object already saved at this moment - if(!sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY)) + if(!sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY)) obj->SaveRespawnTime(); ///- object will get delinked from the manager when deleted Index: /trunk/src/game/AuctionHouse.cpp =================================================================== --- /trunk/src/game/AuctionHouse.cpp (revision 102) +++ /trunk/src/game/AuctionHouse.cpp (revision 229) @@ -179,5 +179,5 @@ } -//this function sends mail, when auction is cancelled to old bidder +//this function sends mail, when auction is canceled to old bidder void WorldSession::SendAuctionCancelledToBidderMail( AuctionEntry* auction ) { @@ -246,5 +246,5 @@ return; } - // prevent sending bag with items (cheat: can be placed in bag after adding equiped empty bag to auction) + // prevent sending bag with items (cheat: can be placed in bag after adding equipped empty bag to auction) if(!it) { Index: /trunk/src/game/ObjectMgr.cpp =================================================================== --- /trunk/src/game/ObjectMgr.cpp (revision 207) +++ /trunk/src/game/ObjectMgr.cpp (revision 229) @@ -893,5 +893,5 @@ } - // replace by new strucutres array + // replace by new structures array const_cast(addon->auras) = new CreatureDataAddonAura[val.size()/2+1]; @@ -3133,5 +3133,5 @@ sLog.outErrorDb("Quest %u has `SrcItemId` = %u but `SrcItemCount` = 0, set to 1 but need fix in DB.", qinfo->GetQuestId(),qinfo->SrcItemId); - qinfo->SrcItemCount = 1; // update to 1 for allow quest work for backward comptibility with DB + qinfo->SrcItemCount = 1; // update to 1 for allow quest work for backward compatibility with DB } } @@ -3536,5 +3536,5 @@ Quest const* quest = GetQuestTemplate(quest_id); - // some quest referenced in spells not exist (outdataed spells) + // some quest referenced in spells not exist (outdated spells) if(!quest) continue; @@ -3896,5 +3896,5 @@ const_cast(quest)->SetFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT); - // continue; - quest objective requiremet set and command can be allowed + // continue; - quest objective requirement set and command can be allowed } @@ -4070,5 +4070,5 @@ std::set::const_iterator itr2 = evt_scripts.find(itr->first); if (itr2 == evt_scripts.end()) - sLog.outErrorDb("Table `event_scripts` has script (Id: %u) not refering to any gameobject_template type 10 data2 field or type 3 data6 field or any spell effect %u", itr->first, SPELL_EFFECT_SEND_EVENT); + sLog.outErrorDb("Table `event_scripts` has script (Id: %u) not referring to any gameobject_template type 10 data2 field or type 3 data6 field or any spell effect %u", itr->first, SPELL_EFFECT_SEND_EVENT); } } @@ -4237,5 +4237,5 @@ } - // the reset_delay must be atleast one day + // the reset_delay must be at least one day temp->reset_delay = std::max((uint32)1, (uint32)(temp->reset_delay * sWorld.getRate(RATE_INSTANCE_RESET_TIME))); } @@ -4538,5 +4538,5 @@ const_cast(quest)->SetFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT); - // continue; - quest modified to required obkective and trigger can be allowed. + // continue; - quest modified to required objective and trigger can be allowed. } @@ -4835,5 +4835,5 @@ if(!AddGraveYardLink(safeLocId,zoneId,team,false)) - sLog.outErrorDb("Table `game_graveyard_zone` has a duplicate record for Garveyard (ID: %u) and Zone (ID: %u), skipped.",safeLocId,zoneId); + sLog.outErrorDb("Table `game_graveyard_zone` has a duplicate record for Graveyard (ID: %u) and Zone (ID: %u), skipped.",safeLocId,zoneId); } while( result->NextRow() ); @@ -5236,5 +5236,5 @@ if(m_auctionid>=0xFFFFFFFF) { - sLog.outError("Auctions ids overflow!! Can't continue, shuting down server. "); + sLog.outError("Auctions ids overflow!! Can't continue, shutting down server. "); sWorld.m_stopEvent = true; } @@ -5247,5 +5247,5 @@ if(m_mailid>=0xFFFFFFFF) { - sLog.outError("Mail ids overflow!! Can't continue, shuting down server. "); + sLog.outError("Mail ids overflow!! Can't continue, shutting down server. "); sWorld.m_stopEvent = true; } @@ -5258,5 +5258,5 @@ if(m_ItemTextId>=0xFFFFFFFF) { - sLog.outError("Item text ids overflow!! Can't continue, shuting down server. "); + sLog.outError("Item text ids overflow!! Can't continue, shutting down server. "); sWorld.m_stopEvent = true; } @@ -5286,5 +5286,5 @@ if(m_hiItemGuid>=0xFFFFFFFF) { - sLog.outError("Item guid overflow!! Can't continue, shuting down server. "); + sLog.outError("Item guid overflow!! Can't continue, shutting down server. "); sWorld.m_stopEvent = true; } @@ -5294,5 +5294,5 @@ if(m_hiCreatureGuid>=0x00FFFFFF) { - sLog.outError("Creature guid overflow!! Can't continue, shuting down server. "); + sLog.outError("Creature guid overflow!! Can't continue, shutting down server. "); sWorld.m_stopEvent = true; } @@ -5302,5 +5302,5 @@ if(m_hiPetGuid>=0x00FFFFFF) { - sLog.outError("Pet guid overflow!! Can't continue, shuting down server. "); + sLog.outError("Pet guid overflow!! Can't continue, shutting down server. "); sWorld.m_stopEvent = true; } @@ -5310,5 +5310,5 @@ if(m_hiCharGuid>=0xFFFFFFFF) { - sLog.outError("Players guid overflow!! Can't continue, shuting down server. "); + sLog.outError("Players guid overflow!! Can't continue, shutting down server. "); sWorld.m_stopEvent = true; } @@ -5318,5 +5318,5 @@ if(m_hiGoGuid>=0x00FFFFFF) { - sLog.outError("Gameobject guid overflow!! Can't continue, shuting down server. "); + sLog.outError("Gameobject guid overflow!! Can't continue, shutting down server. "); sWorld.m_stopEvent = true; } @@ -5326,5 +5326,5 @@ if(m_hiCorpseGuid>=0xFFFFFFFF) { - sLog.outError("Corpse guid overflow!! Can't continue, shuting down server. "); + sLog.outError("Corpse guid overflow!! Can't continue, shutting down server. "); sWorld.m_stopEvent = true; } @@ -5334,5 +5334,5 @@ if(m_hiDoGuid>=0xFFFFFFFF) { - sLog.outError("DynamicObject guid overflow!! Can't continue, shuting down server. "); + sLog.outError("DynamicObject guid overflow!! Can't continue, shutting down server. "); sWorld.m_stopEvent = true; } @@ -6178,5 +6178,5 @@ } - if(strictMask & 0x1) // basic latin + if(strictMask & 0x1) // basic Latin { if(isBasicLatinString(wstr,numericOrSpace)) @@ -6512,5 +6512,5 @@ void ObjectMgr::LoadFishingBaseSkillLevel() { - mFishingBaseForArea.clear(); // for relaod case + mFishingBaseForArea.clear(); // for reload case uint32 count = 0; @@ -6828,5 +6828,5 @@ void ObjectMgr::LoadGameTele() { - m_GameTeleMap.clear(); // for relaod case + m_GameTeleMap.clear(); // for reload case uint32 count = 0; Index: /trunk/src/game/SpellMgr.cpp =================================================================== --- /trunk/src/game/SpellMgr.cpp (revision 219) +++ /trunk/src/game/SpellMgr.cpp (revision 229) @@ -486,5 +486,5 @@ if (!spellproto) return false; - // spells with atleast one negative effect are considered negative + // spells with at least one negative effect are considered negative // some self-applied spells have negative effects but in self casting case negative check ignored. for (int i = 0; i < 3; i++) Index: /trunk/src/game/ThreatManager.h =================================================================== --- /trunk/src/game/ThreatManager.h (revision 102) +++ /trunk/src/game/ThreatManager.h (revision 229) @@ -75,6 +75,6 @@ // The Unit might be in water and the creature can not enter the water, but has range attack - // in this case online = true, but accessable = false - bool isAccessable() const { return iAccessible; } + // in this case online = true, but accessible = false + bool isAccessible() const { return iAccessible; } // used for temporary setting a threat and reducting it later again. Index: /trunk/src/bindings/scripts/include/sc_creature.cpp =================================================================== --- /trunk/src/bindings/scripts/include/sc_creature.cpp (revision 203) +++ /trunk/src/bindings/scripts/include/sc_creature.cpp (revision 229) @@ -74,5 +74,5 @@ void ScriptedAI::MoveInLineOfSight(Unit *who) { - if(m_creature->getVictim() || !m_creature->IsHostileTo(who) || !who->isInAccessablePlaceFor(m_creature)) + if(m_creature->getVictim() || !m_creature->IsHostileTo(who) || !who->isInAccessiblePlaceFor(m_creature)) return; @@ -787,5 +787,5 @@ void Scripted_NoMovementAI::MoveInLineOfSight(Unit *who) { - if( !m_creature->getVictim() && m_creature->canAttack(who) && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) + if( !m_creature->getVictim() && m_creature->canAttack(who) && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) ) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/src/bindings/scripts/scripts/npc/npc_escortAI.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/npc/npc_escortAI.cpp (revision 174) +++ /trunk/src/bindings/scripts/scripts/npc/npc_escortAI.cpp (revision 229) @@ -61,5 +61,5 @@ return; - if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) + if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) ) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/src/bindings/scripts/scripts/creature/mob_event_ai.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/creature/mob_event_ai.cpp (revision 206) +++ /trunk/src/bindings/scripts/scripts/creature/mob_event_ai.cpp (revision 229) @@ -1196,5 +1196,5 @@ return; - if (m_creature->canAttack(who) && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (m_creature->canAttack(who) && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp (revision 166) +++ /trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp (revision 229) @@ -78,5 +78,5 @@ void MoveInLineOfSight(Unit* who) { - if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) + if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) ) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp (revision 166) +++ /trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp (revision 229) @@ -187,5 +187,5 @@ void MoveInLineOfSight(Unit *who) { - if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) + if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) ) { if (!IntroOnce && m_creature->IsWithinDistInMap(who, 75)) Index: /trunk/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp (revision 90) +++ /trunk/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp (revision 229) @@ -163,5 +163,5 @@ return; - if(who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if(who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { float attackRadius = m_creature->GetAttackDistance(who); @@ -277,5 +277,5 @@ if(!who || (!who->isAlive())) return; - if(who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if(who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { float attackRadius = m_creature->GetAttackDistance(who); Index: /trunk/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp (revision 178) +++ /trunk/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp (revision 229) @@ -190,5 +190,5 @@ void MoveInLineOfSight(Unit *who) { - if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) + if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) ) { if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp (revision 204) +++ /trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp (revision 229) @@ -203,5 +203,5 @@ return; - if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) + if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) ) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) @@ -496,5 +496,5 @@ void MoveInLineOfSight(Unit *who) { - if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp (revision 109) +++ /trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp (revision 229) @@ -118,5 +118,5 @@ return; - if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) + if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) ) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp (revision 109) +++ /trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp (revision 229) @@ -350,5 +350,5 @@ return; - if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) + if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) ) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp (revision 90) +++ /trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp (revision 229) @@ -346,5 +346,5 @@ return; - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { float attackRadius = m_creature->GetAttackDistance(who); Index: /trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp (revision 158) +++ /trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp (revision 229) @@ -422,5 +422,5 @@ return; - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { Index: /trunk/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp (revision 109) +++ /trunk/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp (revision 229) @@ -287,5 +287,5 @@ } - if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp (revision 115) +++ /trunk/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp (revision 229) @@ -79,5 +79,5 @@ void MoveInLineOfSight(Unit *who) { - if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) + if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) ) { if( !HasTaunted && m_creature->IsWithinDistInMap(who, 100.0) ) Index: /trunk/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp (revision 223) +++ /trunk/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp (revision 229) @@ -173,5 +173,5 @@ void MoveInLineOfSight(Unit *who) { - if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature)) + if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature)) { if (!HasTaunted && m_creature->IsWithinDistInMap(who, 150.0)) Index: /trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp (revision 115) +++ /trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp (revision 229) @@ -89,5 +89,5 @@ void MoveInLineOfSight(Unit *who) { - if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) + if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) ) { if(!Intro && m_creature->IsWithinDistInMap(who, 100)) Index: /trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp (revision 115) +++ /trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp (revision 229) @@ -179,5 +179,5 @@ return; - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { float attackRadius = m_creature->GetAttackDistance(who); Index: /trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp (revision 187) +++ /trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp (revision 229) @@ -122,5 +122,5 @@ if (!who || m_creature->getVictim()) return; - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { AttackStart(who); Index: /trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp (revision 182) +++ /trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp (revision 229) @@ -237,5 +237,5 @@ return; - if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) + if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) ) { if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp (revision 187) +++ /trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp (revision 229) @@ -279,5 +279,5 @@ return; - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { float attackRadius = m_creature->GetAttackDistance(who); Index: /trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp (revision 164) +++ /trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp (revision 229) @@ -304,5 +304,5 @@ return; - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { //no attack radius check - it attacks the first target that moves in his los Index: /trunk/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp (revision 125) +++ /trunk/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp (revision 229) @@ -89,5 +89,5 @@ } - if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp (revision 109) +++ /trunk/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp (revision 229) @@ -42,5 +42,5 @@ if( who->HasAura(16468,0) ) { - if( who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 15) && who->isInAccessablePlaceFor(m_creature) ) + if( who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 15) && who->isInAccessiblePlaceFor(m_creature) ) { DoCast(who,16472); @@ -49,5 +49,5 @@ } - if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) ) + if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) ) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp (revision 109) +++ /trunk/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp (revision 229) @@ -453,5 +453,5 @@ void MoveInLineOfSight(Unit *who) { - if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) @@ -583,5 +583,5 @@ void MoveInLineOfSight(Unit *who) { - if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) @@ -697,5 +697,5 @@ void MoveInLineOfSight(Unit *who) { - if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp (revision 109) +++ /trunk/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp (revision 229) @@ -50,5 +50,5 @@ return; - if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { float attackRadius = m_creature->GetAttackDistance(who); Index: /trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp (revision 109) +++ /trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp (revision 229) @@ -100,5 +100,5 @@ void MoveInLineOfSight(Unit *who) { - if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp =================================================================== --- /trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp (revision 109) +++ /trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp (revision 229) @@ -90,5 +90,5 @@ void MoveInLineOfSight(Unit *who) { - if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) + if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) Index: /trunk/contrib/extractor/VC71_ad.vcproj =================================================================== --- /trunk/contrib/extractor/VC71_ad.vcproj (revision 2) +++ /trunk/contrib/extractor/VC71_ad.vcproj (revision 229) @@ -53,8 +53,8 @@ RuntimeLibrary="1" UsePrecompiledHeader="0" - PrecompiledHeaderFile="c:\windows\temp/ad.pch" - AssemblerListingLocation="c:\windows\temp/" - ObjectFile="c:\windows\temp/" - ProgramDataBaseFileName="c:\windows\temp/" + PrecompiledHeaderFile="$(IntDir)ad.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" BrowseInformation="1" WarningLevel="3" @@ -150,8 +150,8 @@ RuntimeLibrary="0" UsePrecompiledHeader="0" - PrecompiledHeaderFile="c:\windows\temp/ad.pch" - AssemblerListingLocation="c:\windows\temp/" - ObjectFile="c:\windows\temp/" - ProgramDataBaseFileName="c:\windows\temp/" + PrecompiledHeaderFile="$(IntDir)ad.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" WarningLevel="3" SuppressStartupBanner="true" Index: /trunk/contrib/extractor/VC80_ad.vcproj =================================================================== --- /trunk/contrib/extractor/VC80_ad.vcproj (revision 2) +++ /trunk/contrib/extractor/VC80_ad.vcproj (revision 229) @@ -55,8 +55,9 @@ RuntimeLibrary="1" UsePrecompiledHeader="0" - PrecompiledHeaderFile="c:\windows\temp/ad.pch" - AssemblerListingLocation="c:\windows\temp/" - ObjectFile="c:\windows\temp/" - ProgramDataBaseFileName="c:\windows\temp/" + PrecompiledHeaderFile="$(IntDir)ad.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" + XMLDocumentationFileName="$(IntDir)\" BrowseInformation="1" WarningLevel="3" @@ -81,5 +82,5 @@ LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="./debug/" + AdditionalLibraryDirectories="./debug" IgnoreDefaultLibraryNames="LIBCD.lib" GenerateDebugInformation="true" @@ -154,7 +155,8 @@ UsePrecompiledHeader="0" PrecompiledHeaderFile="c:\windows\temp/ad.pch" - AssemblerListingLocation="c:\windows\temp/" - ObjectFile="c:\windows\temp/" - ProgramDataBaseFileName="c:\windows\temp/" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" + XMLDocumentationFileName="$(IntDir)\" WarningLevel="3" SuppressStartupBanner="true" @@ -177,5 +179,5 @@ LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="./release/" + AdditionalLibraryDirectories="./release" IgnoreDefaultLibraryNames="LIBC.lib" ProgramDatabaseFile="./ad.pdb" Index: /trunk/contrib/extractor/VC90_ad.vcproj =================================================================== --- /trunk/contrib/extractor/VC90_ad.vcproj (revision 2) +++ /trunk/contrib/extractor/VC90_ad.vcproj (revision 229) @@ -5,4 +5,5 @@ Name="ad" ProjectGUID="{D7552D4F-408F-4F8E-859B-366659150CF4}" + RootNamespace="ad" TargetFrameworkVersion="131072" > @@ -54,9 +55,11 @@ RuntimeLibrary="1" UsePrecompiledHeader="0" - PrecompiledHeaderFile="c:\windows\temp/ad.pch" - AssemblerListingLocation="c:\windows\temp/" - ObjectFile="c:\windows\temp/" - ProgramDataBaseFileName="c:\windows\temp/" + PrecompiledHeaderFile="$(IntDir)ad.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" + XMLDocumentationFileName="$(IntDir)\" BrowseInformation="1" + BrowseInformationFile="$(IntDir)" WarningLevel="3" SuppressStartupBanner="true" @@ -150,8 +153,9 @@ RuntimeLibrary="0" UsePrecompiledHeader="0" - PrecompiledHeaderFile="c:\windows\temp/ad.pch" - AssemblerListingLocation="c:\windows\temp/" - ObjectFile="c:\windows\temp/" - ProgramDataBaseFileName="c:\windows\temp/" + PrecompiledHeaderFile="$(IntDir)ad.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" + XMLDocumentationFileName="$(IntDir)\" WarningLevel="3" SuppressStartupBanner="true"