diff options
| author | click <clickvd@gonnamakeyou.com> | 2011-06-12 01:47:45 +0200 |
|---|---|---|
| committer | click <clickvd@gonnamakeyou.com> | 2011-06-12 01:47:45 +0200 |
| commit | f16df538eeaecbb5e9364368cfa48d04f48db4de (patch) | |
| tree | 21451f2febc083a2cc6953d1ff88292305fe8364 /src/server/game/Spells | |
| parent | 158966dc793f47dd4ada264da775f647601298aa (diff) | |
Core: More codestyle cleanups
Diffstat (limited to 'src/server/game/Spells')
| -rwxr-xr-x | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Spells/Auras/SpellAuras.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Spells/Spell.cpp | 34 | ||||
| -rwxr-xr-x | src/server/game/Spells/SpellEffects.cpp | 18 |
4 files changed, 30 insertions, 30 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index f2c51933e82..d19ee3d7d3a 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -419,7 +419,7 @@ int32 AuraEffect::CalculateAmount(Unit* caster) // check item enchant aura cast if (!amount && caster) if (uint64 itemGUID = GetBase()->GetCastItemGUID()) - if (Player *playerCaster = dynamic_cast<Player*>(caster)) + if (Player* playerCaster = dynamic_cast<Player*>(caster)) if (Item *castItem = playerCaster->GetItemByGuid(itemGUID)) if (castItem->GetItemSuffixFactor()) { @@ -6378,7 +6378,7 @@ void AuraEffect::HandleChannelDeathItem(AuraApplication const* aurApp, uint8 mod return; Player *plCaster = caster->ToPlayer(); - Unit *target = aurApp->GetTarget(); + Unit* target = aurApp->GetTarget(); if (target->getDeathState() != JUST_DIED) return; diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 6a692d47605..9b1eb9aba89 100755 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1416,7 +1416,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b if (caster->GetTypeId() != TYPEID_PLAYER) break; - Player *player = caster->ToPlayer(); + Player* player = caster->ToPlayer(); // Glyph of Guardian Spirit if (AuraEffect * aurEff = player->GetAuraEffect(63231, 0)) { @@ -1678,7 +1678,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b } } -bool Aura::CanBeAppliedOn(Unit *target) +bool Aura::CanBeAppliedOn(Unit* target) { // unit not in world or during remove from world if (!target->IsInWorld() || target->IsDuringRemoveFromWorld()) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index a9489eeb1af..8f537b1111d 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -91,7 +91,7 @@ SpellCastTargets::~SpellCastTargets() { } -void SpellCastTargets::setUnitTarget(Unit *target) +void SpellCastTargets::setUnitTarget(Unit* target) { if (!target) return; @@ -223,7 +223,7 @@ void SpellCastTargets::Update(Unit* caster) m_itemTarget = NULL; if (caster->GetTypeId() == TYPEID_PLAYER) { - Player *player = caster->ToPlayer(); + Player* player = caster->ToPlayer(); if (m_targetMask & TARGET_FLAG_ITEM) m_itemTarget = player->GetItemByGuid(m_itemTargetGUID); else if (m_targetMask & TARGET_FLAG_TRADE_ITEM) @@ -1762,7 +1762,7 @@ void Spell::SearchAreaTarget(std::list<Unit*> &TagUnitMap, float radius, SpellNo break; case PUSH_CHAIN: { - Unit *target = m_targets.getUnitTarget(); + Unit* target = m_targets.getUnitTarget(); if (!target) { sLog->outError("SPELL: cannot find unit target for spell ID %u\n", m_spellInfo->Id); @@ -1893,7 +1893,7 @@ WorldObject* Spell::SearchNearbyTarget(float range, SpellTargets TargetType, Spe default: case SPELL_TARGETS_ENEMY: { - Unit *target = NULL; + Unit* target = NULL; Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(m_caster, m_caster, range); Trinity::UnitLastSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(m_caster, target, u_check); m_caster->VisitNearbyObject(range, searcher); @@ -1901,7 +1901,7 @@ WorldObject* Spell::SearchNearbyTarget(float range, SpellTargets TargetType, Spe } case SPELL_TARGETS_ALLY: { - Unit *target = NULL; + Unit* target = NULL; Trinity::AnyFriendlyUnitInObjectRangeCheck u_check(m_caster, m_caster, range); Trinity::UnitLastSearcher<Trinity::AnyFriendlyUnitInObjectRangeCheck> searcher(m_caster, target, u_check); m_caster->VisitNearbyObject(range, searcher); @@ -1975,7 +1975,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) case TARGET_TYPE_UNIT_TARGET: { - Unit *target = m_targets.getUnitTarget(); + Unit* target = m_targets.getUnitTarget(); if (!target) { sLog->outError("SPELL: no unit target for spell ID %u", m_spellInfo->Id); @@ -2129,7 +2129,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) case TARGET_TYPE_DEST_TARGET: //2+8+2 { - Unit *target = m_targets.getUnitTarget(); + Unit* target = m_targets.getUnitTarget(); if (!target) { sLog->outError("SPELL: no unit target for spell ID %u", m_spellInfo->Id); @@ -2229,7 +2229,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) else { sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "SPELL: unknown target coordinates for spell ID %u", m_spellInfo->Id); - Unit *target = NULL; + Unit* target = NULL; if (uint64 guid = m_caster->GetUInt64Value(UNIT_FIELD_TARGET)) target = ObjectAccessor::GetUnit(*m_caster, guid); m_targets.setDst(target ? *target : *m_caster); @@ -2314,7 +2314,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) if (pushType == PUSH_CHAIN) // Chain { - Unit *target = m_targets.getUnitTarget(); + Unit* target = m_targets.getUnitTarget(); if (!target) { sLog->outError("SPELL: no chain unit target for spell ID %u", m_spellInfo->Id); @@ -2747,7 +2747,7 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect const* triggered if (!m_targets.getUnitTargetGUID() && m_spellInfo->Targets & TARGET_FLAG_UNIT) { - Unit *target = NULL; + Unit* target = NULL; if (m_caster->GetTypeId() == TYPEID_UNIT) target = m_caster->getVictim(); else @@ -2780,7 +2780,7 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect const* triggered if (!m_targets.HasDst() && m_spellInfo->Targets & TARGET_FLAG_DEST_LOCATION) { - Unit *target = m_targets.getUnitTarget(); + Unit* target = m_targets.getUnitTarget(); if (!target) { if (m_caster->GetTypeId() == TYPEID_UNIT) @@ -2987,7 +2987,7 @@ void Spell::cast(bool skipCheck) // update pointers base at GUIDs to prevent access to non-existed already object UpdatePointers(); - if (Unit *target = m_targets.getUnitTarget()) + if (Unit* target = m_targets.getUnitTarget()) { // three check: prepare, cast (m_casttime > 0), hit (delayed) if (m_casttime && target->isAlive() && !target->IsFriendlyTo(m_caster) && !m_caster->canSeeOrDetect(target)) @@ -3010,7 +3010,7 @@ void Spell::cast(bool skipCheck) // now that we've done the basic check, now run the scripts // should be done before the spell is actually executed - if (Player *playerCaster = m_caster->ToPlayer()) + if (Player* playerCaster = m_caster->ToPlayer()) sScriptMgr->OnPlayerSpellCast(playerCaster, this, skipCheck); SetExecutedCurrently(true); @@ -4700,7 +4700,7 @@ SpellCastResult Spell::CheckCast(bool strict) return SPELL_FAILED_MOVING; } - Unit *target = m_targets.getUnitTarget(); + Unit* target = m_targets.getUnitTarget(); // In pure self-cast spells, the client won't send any unit target if (!target && (m_targets.getTargetMask() == TARGET_FLAG_SELF || m_targets.getTargetMask() & TARGET_FLAG_UNIT_CASTER)) // TARGET_FLAG_SELF == 0, remember! @@ -4757,7 +4757,7 @@ SpellCastResult Spell::CheckCast(bool strict) { if (target->GetTypeId() == TYPEID_PLAYER) { - Player *player = target->ToPlayer(); + Player* player = target->ToPlayer(); if (!player->GetWeaponForAttack(BASE_ATTACK) || !player->IsUseEquipedWeapon(true)) return SPELL_FAILED_TARGET_NO_WEAPONS; } @@ -5408,7 +5408,7 @@ SpellCastResult Spell::CheckCast(bool strict) return SPELL_FAILED_ALREADY_HAVE_CHARM; } - if (Unit *target = m_targets.getUnitTarget()) + if (Unit* target = m_targets.getUnitTarget()) { if (target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->IsVehicle()) return SPELL_FAILED_BAD_IMPLICIT_TARGETS; @@ -5724,7 +5724,7 @@ SpellCastResult Spell::CheckRange(bool strict) SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex); - Unit *target = m_targets.getUnitTarget(); + Unit* target = m_targets.getUnitTarget(); float max_range = (float)m_caster->GetSpellMaxRangeForTarget(target, srange); float min_range = (float)m_caster->GetSpellMinRangeForTarget(target, srange); uint32 range_type = GetSpellRangeType(srange); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 77391ef03ae..fdb6e878092 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1007,7 +1007,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) if (m_caster->GetTypeId() != TYPEID_PLAYER) return; - Player *player = (Player*)m_caster; + Player* player = (Player*)m_caster; if (player && player->GetQuestStatus(11379) == QUEST_STATUS_INCOMPLETE) { @@ -1157,7 +1157,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) // use 99 because it is 3d search SearchAreaTarget(unitList, 99, PUSH_DST_CENTER, SPELL_TARGETS_ENTRY, 33114); float minDist = 99 * 99; - Unit *target = NULL; + Unit* target = NULL; for (std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end(); ++itr) { if (Vehicle *seat = (*itr)->GetVehicleKit()) @@ -2860,7 +2860,7 @@ void Spell::EffectSummonChangeItem(SpellEffIndex effIndex) if (m_caster->GetTypeId() != TYPEID_PLAYER) return; - Player *player = (Player*)m_caster; + Player* player = (Player*)m_caster; // applied only to using item if (!m_CastItem) @@ -3135,7 +3135,7 @@ void Spell::EffectLearnSpell(SpellEffIndex effIndex) return; } - Player *player = (Player*)unitTarget; + Player* player = (Player*)unitTarget; uint32 spellToLearn = (m_spellInfo->Id == 483 || m_spellInfo->Id == 55884) ? damage : m_spellInfo->EffectTriggerSpell[effIndex]; player->learnSpell(spellToLearn, false); @@ -3609,7 +3609,7 @@ void Spell::EffectEnchantItemTmp(SpellEffIndex effIndex) { if (item->IsFitToSpellRequirements(m_spellInfo)) { - Spell *spell = new Spell(m_caster, spellInfo, true); + Spell* spell = new Spell(m_caster, spellInfo, true); SpellCastTargets targets; targets.setItemTarget(item); spell->prepare(&targets); @@ -5547,7 +5547,7 @@ void Spell::EffectApplyGlyph(SpellEffIndex effIndex) if (m_caster->GetTypeId() != TYPEID_PLAYER || m_glyphIndex >= MAX_GLYPH_SLOT_INDEX) return; - Player *player = (Player*)m_caster; + Player* player = (Player*)m_caster; // glyph sockets level requirement uint8 minLevel = 0; @@ -5660,7 +5660,7 @@ void Spell::EffectInebriate(SpellEffIndex /*effIndex*/) if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; - Player *player = (Player*)unitTarget; + Player* player = (Player*)unitTarget; uint16 currentDrunk = player->GetDrunkValue(); uint16 drunkMod = damage * 256; if (currentDrunk + drunkMod > 0xFFFF) @@ -5984,7 +5984,7 @@ void Spell::EffectSkinning(SpellEffIndex /*effIndex*/) void Spell::EffectCharge(SpellEffIndex /*effIndex*/) { - Unit *target = m_targets.getUnitTarget(); + Unit* target = m_targets.getUnitTarget(); if (!target) return; @@ -7039,7 +7039,7 @@ void Spell::EffectRechargeManaGem(SpellEffIndex /*effIndex*/) if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; - Player *player = m_caster->ToPlayer(); + Player* player = m_caster->ToPlayer(); if (!player) return; |
