diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-03-21 10:52:14 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-03-21 10:52:14 +0100 |
| commit | 2f79b0f266e48778f13f9e183b41bfd8baa6f8bd (patch) | |
| tree | 24d015e1cd21d43393e690ce624db3dda9b3ed73 /src/server/game/Entities | |
| parent | f8162d609ba2d010fadaed56a0dc51df17c3b7a1 (diff) | |
Core: Removed all double (and more) empty lines
Diffstat (limited to 'src/server/game/Entities')
| -rwxr-xr-x | src/server/game/Entities/Creature/Creature.cpp | 1 | ||||
| -rwxr-xr-x | src/server/game/Entities/GameObject/GameObject.cpp | 1 | ||||
| -rwxr-xr-x | src/server/game/Entities/Item/Item.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 5 | ||||
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.h | 1 | ||||
| -rwxr-xr-x | src/server/game/Entities/Vehicle/Vehicle.cpp | 1 | ||||
| -rwxr-xr-x | src/server/game/Entities/Vehicle/Vehicle.h | 1 |
8 files changed, 0 insertions, 14 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 9b9d006b6bf..07a2ce1b886 100755 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -49,7 +49,6 @@ #include "Group.h" // apply implementation of the singletons - TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const { TrainerSpellMap::const_iterator itr = spellList.find(spell_id); diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 4c85977aec5..82ad16cc624 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -827,7 +827,6 @@ bool GameObject::IsDynTransport() const return gInfo->type == GAMEOBJECT_TYPE_MO_TRANSPORT || (gInfo->type == GAMEOBJECT_TYPE_TRANSPORT && !gInfo->transport.pause); } - Unit* GameObject::GetOwner() const { return ObjectAccessor::GetUnit(*this, GetOwnerGUID()); diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index c483f72a58d..29dff322631 100755 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -767,7 +767,6 @@ bool Item::CanBeTraded(bool mail, bool trade) const return true; } - bool Item::HasEnchantRequiredSkill(const Player *pPlayer) const { @@ -781,7 +780,6 @@ bool Item::HasEnchantRequiredSkill(const Player *pPlayer) const return true; } - uint32 Item::GetEnchantRequiredLevel() const { diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1d4de33e6d0..6465b00d05b 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -15170,7 +15170,6 @@ bool Player::SatisfyQuestPreviousQuest(Quest const* qInfo, bool msg) return true; } - // If any of the negative previous quests active, return true if (*iter < 0 && GetQuestStatus(prevId) != QUEST_STATUS_NONE) { @@ -21721,7 +21720,6 @@ void Player::SetDailyQuestStatus(uint32 quest_id) } } - void Player::SetWeeklyQuestStatus(uint32 quest_id) { m_weeklyquests.insert(quest_id); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 994326aa9c3..fad6eb8a706 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -312,7 +312,6 @@ void Unit::SendMonsterMoveWithSpeedToCurrentDestination(Player* player) SendMonsterMoveWithSpeed(x, y, z, 0, player); } - void Unit::SendMonsterMoveWithSpeed(float x, float y, float z, uint32 transitTime, Player* player) { if (!transitTime) @@ -3720,7 +3719,6 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit else RemoveAuraFromStack(iter, AURA_REMOVE_BY_ENEMY_SPELL); - if (Aura * newAura = stealCharge ? stealer->GetAura(aura->GetId(), aura->GetCasterGUID()) : NULL) { uint8 newCharges = newAura->GetCharges() + 1; @@ -3836,7 +3834,6 @@ void Unit::RemoveNotOwnSingleTargetAuras(uint32 newPhase) } } - void Unit::RemoveAurasWithInterruptFlags(uint32 flag, uint32 except) { if (!(m_interruptMask & flag)) @@ -11104,7 +11101,6 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint if (AuraEffect const* Tenacity = pVictim->GetAuraEffect(58549, 0)) AddPctN(TakenTotalMod, Tenacity->GetAmount()); - // Healing taken percent float minval = (float)pVictim->GetMaxNegativeAuraModifier(SPELL_AURA_MOD_HEALING_PCT); if (minval) @@ -12655,7 +12651,6 @@ Unit* Creature::SelectVictim() return target; } - Unit::AuraEffectList const& iAuras = GetAuraEffectsByType(SPELL_AURA_MOD_INVISIBILITY); if(!iAuras.empty()) { diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index dcfc8ab4364..5cb2ddb4db0 100755 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1380,7 +1380,6 @@ class Unit : public WorldObject void CalculateSpellDamageTaken(SpellNonMeleeDamage *damageInfo, int32 damage, SpellEntry const *spellInfo, WeaponAttackType attackType = BASE_ATTACK, bool crit = false); void DealSpellDamage(SpellNonMeleeDamage *damageInfo, bool durabilityLoss); - // player or player's pet resilience (-1%) float GetMeleeCritChanceReduction() const { return GetCombatRatingReduction(CR_CRIT_TAKEN_MELEE); } float GetRangedCritChanceReduction() const { return GetCombatRatingReduction(CR_CRIT_TAKEN_RANGED); } diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index f5efdd3bad1..65c06b56049 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -244,7 +244,6 @@ void Vehicle::InstallAccessory(uint32 entry, int8 seatId, bool minion, uint8 typ if (minion) accessory->AddUnitTypeMask(UNIT_MASK_ACCESSORY); - if (!me->HandleSpellClick(accessory, seatId)) { accessory->AddObjectToRemoveList(); diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index 9b7b0f7d9d1..413d2e24bf2 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -77,7 +77,6 @@ enum VehicleSpells VEHICLE_SPELL_PARACHUTE = 45472 }; - struct VehicleSeat { explicit VehicleSeat(VehicleSeatEntry const *_seatInfo) : seatInfo(_seatInfo), passenger(NULL) {} |
