diff options
| author | Ascathor <Break_the_Chain@web.de> | 2013-10-27 22:27:46 +0100 |
|---|---|---|
| committer | Ascathor <Break_the_Chain@web.de> | 2013-10-27 23:46:02 +0100 |
| commit | 260773899052255447ed90be344efd38437bcdde (patch) | |
| tree | ded631c07d1946649ce384201c1c7c92967bcf7f /src/server/game/Entities | |
| parent | e5553cfb78d8bdde4e9c6a2dbc98ff60bb8a273e (diff) | |
Core/Code: Unify codestyle for brackets: {} to { }.
Also added missing copyright to some files.
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.h | 8 | ||||
| -rw-r--r-- | src/server/game/Entities/Creature/CreatureGroups.h | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Creature/TemporarySummon.h | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Item/ItemEnchantmentMgr.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 14 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.h | 12 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/ObjectPosSelector.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 24 | ||||
| -rw-r--r-- | src/server/game/Entities/Totem/Totem.h | 14 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 20 | ||||
| -rw-r--r-- | src/server/game/Entities/Vehicle/Vehicle.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Vehicle/VehicleDefines.h | 2 |
14 files changed, 57 insertions, 57 deletions
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 5b1cb99d93d..08d3610594f 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -246,7 +246,7 @@ typedef UNORDERED_MAP<uint32, EquipmentInfoContainerInternal> EquipmentInfoConta // from `creature` table struct CreatureData { - CreatureData() : dbData(true) {} + CreatureData() : dbData(true) { } uint32 id; // entry in creature_template uint16 mapid; uint32 phaseMask; @@ -325,7 +325,7 @@ typedef UNORDERED_MAP<uint32, CreatureAddon> CreatureAddonContainer; struct VendorItem { VendorItem(uint32 _item, int32 _maxcount, uint32 _incrtime, uint32 _ExtendedCost) - : item(_item), maxcount(_maxcount), incrtime(_incrtime), ExtendedCost(_ExtendedCost) {} + : item(_item), maxcount(_maxcount), incrtime(_incrtime), ExtendedCost(_ExtendedCost) { } uint32 item; uint32 maxcount; // 0 for infinity item amount @@ -367,7 +367,7 @@ struct VendorItemData struct VendorItemCount { explicit VendorItemCount(uint32 _item, uint32 _count) - : itemId(_item), count(_count), lastIncrementTime(time(NULL)) {} + : itemId(_item), count(_count), lastIncrementTime(time(NULL)) { } uint32 itemId; uint32 count; @@ -399,7 +399,7 @@ typedef UNORDERED_MAP<uint32 /*spellid*/, TrainerSpell> TrainerSpellMap; struct TrainerSpellData { - TrainerSpellData() : trainerType(0) {} + TrainerSpellData() : trainerType(0) { } ~TrainerSpellData() { spellList.clear(); } TrainerSpellMap spellList; diff --git a/src/server/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h index fb5b823fbe9..91a7ac7ff5e 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.h +++ b/src/server/game/Entities/Creature/CreatureGroups.h @@ -60,8 +60,8 @@ class CreatureGroup public: //Group cannot be created empty - explicit CreatureGroup(uint32 id) : m_leader(NULL), m_groupID(id), m_Formed(false) {} - ~CreatureGroup() {} + explicit CreatureGroup(uint32 id) : m_leader(NULL), m_groupID(id), m_Formed(false) { } + ~CreatureGroup() { } Creature* getLeader() const { return m_leader; } uint32 GetId() const { return m_groupID; } diff --git a/src/server/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h index 46f5c1300a4..03fcd4cd74d 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.h +++ b/src/server/game/Entities/Creature/TemporarySummon.h @@ -41,14 +41,14 @@ class TempSummon : public Creature { public: explicit TempSummon(SummonPropertiesEntry const* properties, Unit* owner, bool isWorldObject); - virtual ~TempSummon() {} + virtual ~TempSummon() { } void Update(uint32 time); virtual void InitStats(uint32 lifetime); virtual void InitSummon(); virtual void UnSummon(uint32 msTime = 0); void RemoveFromWorld(); void SetTempSummonType(TempSummonType type); - void SaveToDB(uint32 /*mapid*/, uint8 /*spawnMask*/, uint32 /*phaseMask*/) {} + void SaveToDB(uint32 /*mapid*/, uint8 /*spawnMask*/, uint32 /*phaseMask*/) { } Unit* GetSummoner() const; Creature* GetSummonerCreatureBase() const; uint64 GetSummonerGUID() const { return m_summonerGUID; } diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index de92257893b..27ea15c38ff 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -589,7 +589,7 @@ enum GOState // from `gameobject` struct GameObjectData { - explicit GameObjectData() : dbData(true) {} + explicit GameObjectData() : dbData(true) { } uint32 id; // entry in gamobject_template uint16 mapid; uint32 phaseMask; diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp index ba9604fcd52..1d0b7b66d6d 100644 --- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp +++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp @@ -33,10 +33,10 @@ struct EnchStoreItem float chance; EnchStoreItem() - : ench(0), chance(0) {} + : ench(0), chance(0) { } EnchStoreItem(uint32 _ench, float _chance) - : ench(_ench), chance(_chance) {} + : ench(_ench), chance(_chance) { } }; typedef std::vector<EnchStoreItem> EnchStoreList; diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 1471e966045..b7417c0e7c6 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1881,7 +1881,7 @@ namespace Trinity { public: MonsterChatBuilder(WorldObject const& obj, ChatMsg msgtype, int32 textId, uint32 language, uint64 targetGUID) - : i_object(obj), i_msgtype(msgtype), i_textId(textId), i_language(language), i_targetGUID(targetGUID) {} + : i_object(obj), i_msgtype(msgtype), i_textId(textId), i_language(language), i_targetGUID(targetGUID) { } void operator()(WorldPacket& data, LocaleConstant loc_idx) { char const* text = sObjectMgr->GetTrinityString(i_textId, loc_idx); @@ -1902,7 +1902,7 @@ namespace Trinity { public: MonsterCustomChatBuilder(WorldObject const& obj, ChatMsg msgtype, const char* text, uint32 language, uint64 targetGUID) - : i_object(obj), i_msgtype(msgtype), i_text(text), i_language(language), i_targetGUID(targetGUID) {} + : i_object(obj), i_msgtype(msgtype), i_text(text), i_language(language), i_targetGUID(targetGUID) { } void operator()(WorldPacket& data, LocaleConstant loc_idx) { /// @todo i_object.GetName() also must be localized? @@ -2426,10 +2426,10 @@ namespace Trinity { public: NearUsedPosDo(WorldObject const& obj, WorldObject const* searcher, float angle, ObjectPosSelector& selector) - : i_object(obj), i_searcher(searcher), i_angle(angle), i_selector(selector) {} + : i_object(obj), i_searcher(searcher), i_angle(angle), i_selector(selector) { } - void operator()(Corpse*) const {} - void operator()(DynamicObject*) const {} + void operator()(Corpse*) const { } + void operator()(DynamicObject*) const { } void operator()(Creature* c) const { @@ -2850,7 +2850,7 @@ struct WorldObjectChangeAccumulator UpdateDataMapType& i_updateDatas; WorldObject& i_object; std::set<uint64> plr_list; - WorldObjectChangeAccumulator(WorldObject &obj, UpdateDataMapType &d) : i_updateDatas(d), i_object(obj) {} + WorldObjectChangeAccumulator(WorldObject &obj, UpdateDataMapType &d) : i_updateDatas(d), i_object(obj) { } void Visit(PlayerMapType &m) { Player* source = NULL; @@ -2912,7 +2912,7 @@ struct WorldObjectChangeAccumulator } } - template<class SKIP> void Visit(GridRefManager<SKIP> &) {} + template<class SKIP> void Visit(GridRefManager<SKIP> &) { } }; void WorldObject::BuildUpdate(UpdateDataMapType& data_map) diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 3e010fa98a2..f03b95d0cc7 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -200,7 +200,7 @@ class Object virtual bool hasQuest(uint32 /* quest_id */) const { return false; } virtual bool hasInvolvedQuest(uint32 /* quest_id */) const { return false; } - virtual void BuildUpdate(UpdateDataMapType&) {} + virtual void BuildUpdate(UpdateDataMapType&) { } void BuildFieldsUpdate(Player*, UpdateDataMapType &) const; void SetFieldNotifyFlag(uint16 flag) { _fieldNotifyFlags |= flag; } @@ -275,13 +275,13 @@ struct Position { struct PositionXYZStreamer { - explicit PositionXYZStreamer(Position& pos) : m_pos(&pos) {} + explicit PositionXYZStreamer(Position& pos) : m_pos(&pos) { } Position* m_pos; }; struct PositionXYZOStreamer { - explicit PositionXYZOStreamer(Position& pos) : m_pos(&pos) {} + explicit PositionXYZOStreamer(Position& pos) : m_pos(&pos) { } Position* m_pos; }; @@ -536,7 +536,7 @@ class MapObject friend class ObjectGridLoader; //grid loader for loading creatures protected: - MapObject() : _moveState(MAP_OBJECT_CELL_MOVE_NONE) {} + MapObject() : _moveState(MAP_OBJECT_CELL_MOVE_NONE) { } private: Cell _currentCell; @@ -650,7 +650,7 @@ class WorldObject : public Object, public WorldLocation void SendObjectDeSpawnAnim(uint64 guid); - virtual void SaveRespawnTime() {} + virtual void SaveRespawnTime() { } void AddObjectToRemoveList(); float GetGridActivationRange() const; @@ -789,7 +789,7 @@ namespace Trinity class ObjectDistanceOrderPred { public: - ObjectDistanceOrderPred(WorldObject const* pRefObj, bool ascending = true) : m_refObj(pRefObj), m_ascending(ascending) {} + ObjectDistanceOrderPred(WorldObject const* pRefObj, bool ascending = true) : m_refObj(pRefObj), m_ascending(ascending) { } bool operator()(WorldObject const* pLeft, WorldObject const* pRight) const { return m_ascending ? m_refObj->GetDistanceOrder(pLeft, pRight) : !m_refObj->GetDistanceOrder(pLeft, pRight); diff --git a/src/server/game/Entities/Object/ObjectPosSelector.h b/src/server/game/Entities/Object/ObjectPosSelector.h index d381fb5627e..d3f43654969 100644 --- a/src/server/game/Entities/Object/ObjectPosSelector.h +++ b/src/server/game/Entities/Object/ObjectPosSelector.h @@ -34,7 +34,7 @@ struct ObjectPosSelector { struct UsedPos { - UsedPos(float sign_, float size_, float dist_) : sign(sign_), size(size_), dist(dist_) {} + UsedPos(float sign_, float size_, float dist_) : sign(sign_), size(size_), dist(dist_) { } float sign; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 80f3f022a20..4f0d48d1a53 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -6215,7 +6215,7 @@ bool Player::UpdateFishingSkill() // levels sync. with spell requirement for skill levels to learn // bonus abilities in sSkillLineAbilityStore // Used only to avoid scan DBC at each skill grow -static uint32 bonusSkillLevels[] = {75, 150, 225, 300, 375, 450}; +static uint32 bonusSkillLevels[ ] = {75, 150, 225, 300, 375, 450}; static const size_t bonusSkillLevelsSize = sizeof(bonusSkillLevels) / sizeof(uint32); bool Player::UpdateSkillPro(uint16 SkillId, int32 Chance, uint32 step) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index fee542a752e..35a3f5f10d4 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -111,7 +111,7 @@ struct PlayerTalent // Spell modifier (used for modify other spells) struct SpellModifier { - SpellModifier(Aura* _ownerAura = NULL) : op(SPELLMOD_DAMAGE), type(SPELLMOD_FLAT), charges(0), value(0), mask(), spellId(0), ownerAura(_ownerAura) {} + SpellModifier(Aura* _ownerAura = NULL) : op(SPELLMOD_DAMAGE), type(SPELLMOD_FLAT), charges(0), value(0), mask(), spellId(0), ownerAura(_ownerAura) { } SpellModOp op : 8; SpellModType type : 8; int16 charges : 16; @@ -179,7 +179,7 @@ enum ReputationSource struct ActionButton { - ActionButton() : packedData(0), uState(ACTIONBUTTON_NEW) {} + ActionButton() : packedData(0), uState(ACTIONBUTTON_NEW) { } uint32 packedData; ActionButtonUpdateState uState; @@ -205,7 +205,7 @@ typedef std::map<uint8, ActionButton> ActionButtonList; struct PlayerCreateInfoItem { - PlayerCreateInfoItem(uint32 id, uint32 amount) : item_id(id), item_amount(amount) {} + PlayerCreateInfoItem(uint32 id, uint32 amount) : item_id(id), item_amount(amount) { } uint32 item_id; uint32 item_amount; @@ -215,7 +215,7 @@ typedef std::list<PlayerCreateInfoItem> PlayerCreateInfoItems; struct PlayerClassLevelInfo { - PlayerClassLevelInfo() : basehealth(0), basemana(0) {} + PlayerClassLevelInfo() : basehealth(0), basemana(0) { } uint16 basehealth; uint16 basemana; }; @@ -238,8 +238,8 @@ typedef std::list<uint32> PlayerCreateInfoSpells; struct PlayerCreateInfoAction { - PlayerCreateInfoAction() : button(0), type(0), action(0) {} - PlayerCreateInfoAction(uint8 _button, uint32 _action, uint8 _type) : button(_button), type(_type), action(_action) {} + PlayerCreateInfoAction() : button(0), type(0), action(0) { } + PlayerCreateInfoAction(uint8 _button, uint32 _action, uint8 _type) : button(_button), type(_type), action(_action) { } uint8 button; uint8 type; @@ -270,7 +270,7 @@ struct PlayerInfo struct PvPInfo { - PvPInfo() : IsHostile(false), IsInHostileArea(false), IsInNoPvPArea(false), IsInFFAPvPArea(false), EndTimer(0) {} + PvPInfo() : IsHostile(false), IsInHostileArea(false), IsInNoPvPArea(false), IsInFFAPvPArea(false), EndTimer(0) { } bool IsHostile; bool IsInHostileArea; ///> Marks if player is in an area which forces PvP flag @@ -281,7 +281,7 @@ struct PvPInfo struct DuelInfo { - DuelInfo() : initiator(NULL), opponent(NULL), startTimer(0), startTime(0), outOfBound(0), isMounted(false) {} + DuelInfo() : initiator(NULL), opponent(NULL), startTimer(0), startTime(0), outOfBound(0), isMounted(false) { } Player* initiator; Player* opponent; @@ -343,7 +343,7 @@ struct Runes struct EnchantDuration { - EnchantDuration() : item(NULL), slot(MAX_ENCHANTMENT_SLOT), leftduration(0) {}; + EnchantDuration() : item(NULL), slot(MAX_ENCHANTMENT_SLOT), leftduration(0) { }; EnchantDuration(Item* _item, EnchantmentSlot _slot, uint32 _leftduration) : item(_item), slot(_slot), leftduration(_leftduration){ ASSERT(item); }; @@ -667,7 +667,7 @@ typedef std::map<uint32, EquipmentSet> EquipmentSets; struct ItemPosCount { - ItemPosCount(uint16 _pos, uint32 _count) : pos(_pos), count(_count) {} + ItemPosCount(uint16 _pos, uint32 _count) : pos(_pos), count(_count) { } bool isContainedIn(std::vector<ItemPosCount> const& vec) const; uint16 pos; uint32 count; @@ -833,7 +833,7 @@ struct InstancePlayerBind /* permanent PlayerInstanceBinds are created in Raid/Heroic instances for players that aren't already permanently bound when they are inside when a boss is killed or when they enter an instance that the group leader is permanently bound to. */ - InstancePlayerBind() : save(NULL), perm(false) {} + InstancePlayerBind() : save(NULL), perm(false) { } }; struct AccessRequirement @@ -900,7 +900,7 @@ class PlayerTaxi { public: PlayerTaxi(); - ~PlayerTaxi() {} + ~PlayerTaxi() { } // Nodes void InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level); void LoadTaxiMask(std::string const& data); diff --git a/src/server/game/Entities/Totem/Totem.h b/src/server/game/Entities/Totem/Totem.h index 565d13cd0d0..48cb71c4918 100644 --- a/src/server/game/Entities/Totem/Totem.h +++ b/src/server/game/Entities/Totem/Totem.h @@ -36,7 +36,7 @@ class Totem : public Minion { public: Totem(SummonPropertiesEntry const* properties, Unit* owner); - virtual ~Totem() {} + virtual ~Totem() { } void Update(uint32 time); void InitStats(uint32 duration); void InitSummon(); @@ -48,12 +48,12 @@ class Totem : public Minion bool UpdateStats(Stats /*stat*/) { return true; } bool UpdateAllStats() { return true; } - void UpdateResistances(uint32 /*school*/) {} - void UpdateArmor() {} - void UpdateMaxHealth() {} - void UpdateMaxPower(Powers /*power*/) {} - void UpdateAttackPowerAndDamage(bool /*ranged*/) {} - void UpdateDamagePhysical(WeaponAttackType /*attType*/) {} + void UpdateResistances(uint32 /*school*/) { } + void UpdateArmor() { } + void UpdateMaxHealth() { } + void UpdateMaxPower(Powers /*power*/) { } + void UpdateAttackPowerAndDamage(bool /*ranged*/) { } + void UpdateDamagePhysical(WeaponAttackType /*attType*/) { } bool IsImmunedToSpellEffect(SpellInfo const* spellInfo, uint32 index) const; diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 25352a924ef..f8d5964beca 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -786,7 +786,7 @@ struct DiminishingReturn { DiminishingReturn(DiminishingGroup group, uint32 t, uint32 count) : DRGroup(group), stack(0), hitTime(t), hitCount(count) - {} + { } DiminishingGroup DRGroup:16; uint16 stack:16; @@ -804,7 +804,7 @@ class DispelInfo { public: explicit DispelInfo(Unit* dispeller, uint32 dispellerSpellId, uint8 chargesRemoved) : - _dispellerUnit(dispeller), _dispellerSpell(dispellerSpellId), _chargesRemoved(chargesRemoved) {} + _dispellerUnit(dispeller), _dispellerSpell(dispellerSpellId), _chargesRemoved(chargesRemoved) { } Unit* GetDispeller() const { return _dispellerUnit; } uint32 GetDispellerSpellId() const { return _dispellerSpell; } @@ -822,7 +822,7 @@ private: struct CleanDamage { CleanDamage(uint32 mitigated, uint32 absorbed, WeaponAttackType _attackType, MeleeHitOutcome _hitOutCome) : - absorbed_damage(absorbed), mitigated_damage(mitigated), attackType(_attackType), hitOutCome(_hitOutCome) {} + absorbed_damage(absorbed), mitigated_damage(mitigated), attackType(_attackType), hitOutCome(_hitOutCome) { } uint32 absorbed_damage; uint32 mitigated_damage; @@ -951,7 +951,7 @@ struct SpellNonMeleeDamage SpellNonMeleeDamage(Unit* _attacker, Unit* _target, uint32 _SpellID, uint32 _schoolMask) : target(_target), attacker(_attacker), SpellID(_SpellID), damage(0), overkill(0), schoolMask(_schoolMask), absorb(0), resist(0), physicalLog(false), unused(false), blocked(0), HitInfo(0), cleanDamage(0) - {} + { } Unit *target; Unit *attacker; @@ -972,7 +972,7 @@ struct SpellNonMeleeDamage struct SpellPeriodicAuraLogInfo { SpellPeriodicAuraLogInfo(AuraEffect const* _auraEff, uint32 _damage, uint32 _overDamage, uint32 _absorb, uint32 _resist, float _multiplier, bool _critical) - : auraEff(_auraEff), damage(_damage), overDamage(_overDamage), absorb(_absorb), resist(_resist), multiplier(_multiplier), critical(_critical){} + : auraEff(_auraEff), damage(_damage), overDamage(_overDamage), absorb(_absorb), resist(_resist), multiplier(_multiplier), critical(_critical){ } AuraEffect const* auraEff; uint32 damage; @@ -1027,7 +1027,7 @@ enum CurrentSpellTypes struct GlobalCooldown { - explicit GlobalCooldown(uint32 _dur = 0, uint32 _time = 0) : duration(_dur), cast_time(_time) {} + explicit GlobalCooldown(uint32 _dur = 0, uint32 _time = 0) : duration(_dur), cast_time(_time) { } uint32 duration; uint32 cast_time; @@ -1038,7 +1038,7 @@ typedef UNORDERED_MAP<uint32 /*category*/, GlobalCooldown> GlobalCooldownList; class GlobalCooldownMgr // Shared by Player and CharmInfo { public: - GlobalCooldownMgr() {} + GlobalCooldownMgr() { } public: bool HasGlobalCooldown(SpellInfo const* spellInfo) const; @@ -1080,7 +1080,7 @@ enum CommandStates struct UnitActionBarEntry { - UnitActionBarEntry() : packedData(uint32(ACT_DISABLED) << 24) {} + UnitActionBarEntry() : packedData(uint32(ACT_DISABLED) << 24) { } uint32 packedData; @@ -2255,7 +2255,7 @@ namespace Trinity class PowerPctOrderPred { public: - PowerPctOrderPred(Powers power, bool ascending = true) : m_power(power), m_ascending(ascending) {} + PowerPctOrderPred(Powers power, bool ascending = true) : m_power(power), m_ascending(ascending) { } bool operator() (const Unit* a, const Unit* b) const { float rA = a->GetMaxPower(m_power) ? float(a->GetPower(m_power)) / float(a->GetMaxPower(m_power)) : 0.0f; @@ -2271,7 +2271,7 @@ namespace Trinity class HealthPctOrderPred { public: - HealthPctOrderPred(bool ascending = true) : m_ascending(ascending) {} + HealthPctOrderPred(bool ascending = true) : m_ascending(ascending) { } bool operator() (const Unit* a, const Unit* b) const { float rA = a->GetMaxHealth() ? float(a->GetHealth()) / float(a->GetMaxHealth()) : 0.0f; diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index 9fb1b6614b5..f71ccded926 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -114,7 +114,7 @@ class VehicleJoinEvent : public BasicEvent { friend class Vehicle; protected: - VehicleJoinEvent(Vehicle* v, Unit* u) : Target(v), Passenger(u), Seat(Target->Seats.end()) {} + VehicleJoinEvent(Vehicle* v, Unit* u) : Target(v), Passenger(u), Seat(Target->Seats.end()) { } ~VehicleJoinEvent(); bool Execute(uint64, uint32); void Abort(uint64); diff --git a/src/server/game/Entities/Vehicle/VehicleDefines.h b/src/server/game/Entities/Vehicle/VehicleDefines.h index ce922b550c1..1c3a57593c3 100644 --- a/src/server/game/Entities/Vehicle/VehicleDefines.h +++ b/src/server/game/Entities/Vehicle/VehicleDefines.h @@ -81,7 +81,7 @@ struct VehicleSeat struct VehicleAccessory { VehicleAccessory(uint32 entry, int8 seatId, bool isMinion, uint8 summonType, uint32 summonTime) : - AccessoryEntry(entry), IsMinion(isMinion), SummonTime(summonTime), SeatId(seatId), SummonedType(summonType) {} + AccessoryEntry(entry), IsMinion(isMinion), SummonTime(summonTime), SeatId(seatId), SummonedType(summonType) { } uint32 AccessoryEntry; uint32 IsMinion; uint32 SummonTime; |
