diff options
| author | Vincent-Michael <vincent_michael@gmx.de> | 2015-11-07 20:01:35 +0100 |
|---|---|---|
| committer | Vincent-Michael <vincent_michael@gmx.de> | 2015-11-07 20:01:53 +0100 |
| commit | 7d5e7102cdd407846fa340892df39ea49938ee69 (patch) | |
| tree | d99383a87495bc0a1efb1ee357f00de96b096410 /src/server/game | |
| parent | ff9001ce1da5160ef5dc245a822693f12dc9ddff (diff) | |
Core: Whitespace cleanup
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.h | 6 | ||||
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/OutdoorPvP/OutdoorPvP.h | 4 | ||||
| -rw-r--r-- | src/server/game/Skills/SkillExtraItems.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellHistory.h | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h index 96aa1f735fc..6f9046520b0 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.h +++ b/src/server/game/AI/SmartScripts/SmartScript.h @@ -246,10 +246,10 @@ class SmartScript DecPhase(abs(p)); } - void DecPhase(int32 p = 1) - { + void DecPhase(int32 p = 1) + { if(mEventPhase > (uint32)p) - mEventPhase -= (uint32)p; + mEventPhase -= (uint32)p; else mEventPhase = 0; } diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 6a994d61852..4765a87f9a4 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1411,11 +1411,11 @@ bool Creature::CanStartAttack(Unit const* who, bool force) const return false; // This set of checks is should be done only for creatures - if ((HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC) && who->GetTypeId() != TYPEID_PLAYER) // flag is valid only for non player characters + if ((HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC) && who->GetTypeId() != TYPEID_PLAYER) // flag is valid only for non player characters || (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) && who->GetTypeId() == TYPEID_PLAYER) // immune to PC and target is a player, return false || (who->GetOwner() && who->GetOwner()->GetTypeId() == TYPEID_PLAYER && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC))) // player pets are immune to pc as well return false; - + // Do not attack non-combat pets if (who->GetTypeId() == TYPEID_UNIT && who->GetCreatureType() == CREATURE_TYPE_NON_COMBAT_PET) return false; diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index e4d9e61bca3..afb987f1980 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1863,7 +1863,7 @@ TempSummon* Map::SummonCreature(uint32 entry, Position const& pos, SummonPropert summon = new Minion(properties, summoner, false); break; } - + if (!summon->Create(GenerateLowGuid<HighGuid::Unit>(), this, phase, entry, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), nullptr, vehId)) { delete summon; diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h index b35147a8502..4a423a8da5b 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.h +++ b/src/server/game/OutdoorPvP/OutdoorPvP.h @@ -308,12 +308,12 @@ class OutdoorPvP : public ZoneScript template<class Worker> void BroadcastWorker(Worker& _worker, uint32 zoneId); - + // Hack to store map because this code is just shit void SetMapFromZone(uint32 zone); std::map<ObjectGuid::LowType, GameObject*> m_GoScriptStore; std::map<ObjectGuid::LowType, Creature*> m_CreatureScriptStore; - + Map* m_map; }; diff --git a/src/server/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp index 2c9a2a7bcfd..50e00b24133 100644 --- a/src/server/game/Skills/SkillExtraItems.cpp +++ b/src/server/game/Skills/SkillExtraItems.cpp @@ -210,7 +210,7 @@ bool CanCreatePerfectItem(Player* player, uint32 spellId, float &perfectCreateCh // lack of entry means no perfection proc possible if (!thisEntry) return false; - + // if you don't have the spell needed, then no procs for you if (!player->HasSpell(thisEntry->requiredSpecialization)) return false; @@ -218,7 +218,7 @@ bool CanCreatePerfectItem(Player* player, uint32 spellId, float &perfectCreateCh // set values as appropriate perfectCreateChance = thisEntry->perfectCreateChance; perfectItemType = thisEntry->perfectItemType; - + // and tell the caller to start rolling the dice return true; } diff --git a/src/server/game/Spells/SpellHistory.h b/src/server/game/Spells/SpellHistory.h index 572f407da96..6a1da28f08f 100644 --- a/src/server/game/Spells/SpellHistory.h +++ b/src/server/game/Spells/SpellHistory.h @@ -122,7 +122,7 @@ public: CooldownStorageType::size_type GetCooldownsSizeForPacket() const { return _spellCooldowns.size(); } void SaveCooldownStateBeforeDuel(); void RestoreCooldownStateAfterDuel(); - + private: Player* GetPlayerOwner() const; void SendClearCooldowns(std::vector<int32> const& cooldowns) const; |
