Skip to content

Commit 5d4e657

Browse files
Core: Whitespace cleanup
1 parent 226e0fd commit 5d4e657

3 files changed

Lines changed: 42 additions & 42 deletions

File tree

src/server/game/Entities/Object/Object.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1573,18 +1573,18 @@ bool WorldObject::IsWithinDist3d(float x, float y, float z, float dist) const
15731573
}
15741574

15751575
bool WorldObject::IsWithinDist3d(const Position* pos, float dist) const
1576-
{
1577-
return IsInDist(pos, dist + GetObjectSize());
1576+
{
1577+
return IsInDist(pos, dist + GetObjectSize());
15781578
}
15791579

15801580
bool WorldObject::IsWithinDist2d(float x, float y, float dist) const
15811581
{
1582-
return IsInDist2d(x, y, dist + GetObjectSize());
1582+
return IsInDist2d(x, y, dist + GetObjectSize());
15831583
}
15841584

15851585
bool WorldObject::IsWithinDist2d(const Position* pos, float dist) const
1586-
{
1587-
return IsInDist2d(pos, dist + GetObjectSize());
1586+
{
1587+
return IsInDist2d(pos, dist + GetObjectSize());
15881588
}
15891589

15901590
bool WorldObject::IsWithinDist(WorldObject const* obj, float dist2compare, bool is3D /*= true*/) const
@@ -2027,9 +2027,9 @@ bool WorldObject::canSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo
20272027
return true;
20282028
}
20292029

2030-
bool WorldObject::CanNeverSee(WorldObject const* obj) const
2031-
{
2032-
return GetMap() != obj->GetMap() || !InSamePhase(obj);
2030+
bool WorldObject::CanNeverSee(WorldObject const* obj) const
2031+
{
2032+
return GetMap() != obj->GetMap() || !InSamePhase(obj);
20332033
}
20342034

20352035
bool WorldObject::CanDetect(WorldObject const* obj, bool ignoreStealth) const
@@ -3074,7 +3074,7 @@ void WorldObject::SetPhaseMask(uint32 newPhaseMask, bool update)
30743074
UpdateObjectVisibility();
30753075
}
30763076

3077-
bool WorldObject::InSamePhase(WorldObject const* obj) const
3077+
bool WorldObject::InSamePhase(WorldObject const* obj) const
30783078
{
30793079
return InSamePhase(obj->GetPhaseMask());
30803080
}

src/server/game/Entities/Player/Player.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10174,7 +10174,7 @@ Item* Player::GetItemByPos(uint8 bag, uint8 slot) const
1017410174
}
1017510175

1017610176
//Does additional check for disarmed weapons
10177-
Item* Player::GetUseableItemByPos(uint8 bag, uint8 slot) const
10177+
Item* Player::GetUseableItemByPos(uint8 bag, uint8 slot) const
1017810178
{
1017910179
if (!CanUseAttackType(GetAttackBySlot(slot)))
1018010180
return NULL;
@@ -16023,7 +16023,7 @@ void Player::RemoveQuestSlotState(uint16 slot, uint32 state)
1602316023
RemoveFlag(PLAYER_QUEST_LOG_1_1 + slot * MAX_QUEST_OFFSET + QUEST_STATE_OFFSET, state);
1602416024
}
1602516025

16026-
void Player::SetQuestSlotTimer(uint16 slot, uint32 timer)
16026+
void Player::SetQuestSlotTimer(uint16 slot, uint32 timer)
1602716027
{
1602816028
SetUInt32Value(PLAYER_QUEST_LOG_1_1 + slot * MAX_QUEST_OFFSET + QUEST_TIME_OFFSET, timer);
1602916029
}

src/server/game/Entities/Unit/Unit.cpp

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -443,9 +443,9 @@ void Unit::resetAttackTimer(WeaponAttackType type)
443443
}
444444

445445
float Unit::GetMeleeReach() const
446-
{
447-
float reach = m_floatValues[UNIT_FIELD_COMBATREACH];
448-
return reach > MIN_MELEE_REACH ? reach : MIN_MELEE_REACH;
446+
{
447+
float reach = m_floatValues[UNIT_FIELD_COMBATREACH];
448+
return reach > MIN_MELEE_REACH ? reach : MIN_MELEE_REACH;
449449
}
450450

451451
bool Unit::IsWithinCombatRange(const Unit* obj, float dist2compare) const
@@ -503,14 +503,14 @@ AuraApplication * Unit::GetVisibleAura(uint8 slot) const
503503

504504
void Unit::SetVisibleAura(uint8 slot, AuraApplication * aur)
505505
{
506-
m_visibleAuras[slot]=aur;
507-
UpdateAuraForGroup(slot);
506+
m_visibleAuras[slot]=aur;
507+
UpdateAuraForGroup(slot);
508508
}
509509

510510
void Unit::RemoveVisibleAura(uint8 slot)
511511
{
512-
m_visibleAuras.erase(slot);
513-
UpdateAuraForGroup(slot);
512+
m_visibleAuras.erase(slot);
513+
UpdateAuraForGroup(slot);
514514
}
515515

516516
void Unit::UpdateInterruptMask()
@@ -2635,8 +2635,8 @@ uint32 Unit::GetShieldBlockValue(uint32 soft_cap, uint32 hard_cap) const
26352635
}
26362636

26372637
uint32 Unit::GetUnitMeleeSkill(Unit const* target) const
2638-
{
2639-
return (target ? getLevelForTarget(target) : getLevel()) * 5;
2638+
{
2639+
return (target ? getLevelForTarget(target) : getLevel()) * 5;
26402640
}
26412641

26422642
uint32 Unit::GetDefenseSkillValue(Unit const* target) const
@@ -4169,7 +4169,7 @@ AuraEffect* Unit::GetAuraEffect(AuraType type, SpellFamilyNames family, uint32 f
41694169

41704170
AuraEffect* Unit::GetDummyAuraEffect(SpellFamilyNames name, uint32 iconId, uint8 effIndex) const
41714171
{
4172-
return GetAuraEffect(SPELL_AURA_DUMMY, name, iconId, effIndex);
4172+
return GetAuraEffect(SPELL_AURA_DUMMY, name, iconId, effIndex);
41734173
}
41744174

41754175
AuraApplication * Unit::GetAuraApplication(uint32 spellId, uint64 casterGUID, uint64 itemCasterGUID, uint8 reqEffMask, AuraApplication * except) const
@@ -4696,35 +4696,35 @@ int32 Unit::GetMaxNegativeAuraModifierByAffectMask(AuraType auratype, SpellInfo
46964696

46974697
float Unit::GetResistanceBuffMods(SpellSchools school, bool positive) const
46984698
{
4699-
return GetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school);
4699+
return GetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school);
47004700
}
47014701

47024702
void Unit::SetResistanceBuffMods(SpellSchools school, bool positive, float val)
47034703
{
4704-
SetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school, val);
4704+
SetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school, val);
47054705
}
47064706

47074707
void Unit::ApplyResistanceBuffModsMod(SpellSchools school, bool positive, float val, bool apply)
47084708
{
4709-
ApplyModSignedFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school, val, apply);
4709+
ApplyModSignedFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school, val, apply);
47104710
}
47114711

47124712
void Unit::ApplyResistanceBuffModsPercentMod(SpellSchools school, bool positive, float val, bool apply)
47134713
{
4714-
ApplyPercentModFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school, val, apply);
4714+
ApplyPercentModFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school, val, apply);
47154715
}
47164716

47174717
void Unit::InitStatBuffMods()
47184718
{
47194719
for (uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i)
4720-
SetFloatValue(UNIT_FIELD_POSSTAT0+i, 0);
4720+
SetFloatValue(UNIT_FIELD_POSSTAT0+i, 0);
47214721
for (uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i)
4722-
SetFloatValue(UNIT_FIELD_NEGSTAT0+i, 0);
4722+
SetFloatValue(UNIT_FIELD_NEGSTAT0+i, 0);
47234723
}
47244724

47254725
void Unit::ApplyStatBuffMod(Stats stat, float val, bool apply)
47264726
{
4727-
ApplyModSignedFloatValue((val > 0 ? UNIT_FIELD_POSSTAT0+stat : UNIT_FIELD_NEGSTAT0+stat), val, apply);
4727+
ApplyModSignedFloatValue((val > 0 ? UNIT_FIELD_POSSTAT0+stat : UNIT_FIELD_NEGSTAT0+stat), val, apply);
47284728
}
47294729

47304730
void Unit::ApplyStatPercentBuffMod(Stats stat, float val, bool apply)
@@ -9319,7 +9319,7 @@ Unit* Unit::GetCharm() const
93199319

93209320
Unit* Unit::GetCharmerOrOwner() const
93219321
{
9322-
return GetCharmerGUID() ? GetCharmer() : GetOwner();
9322+
return GetCharmerGUID() ? GetCharmer() : GetOwner();
93239323
}
93249324

93259325
Unit* Unit::GetCharmerOrOwnerOrSelf() const
@@ -9706,14 +9706,14 @@ void Unit::RemoveAllControlled()
97069706
sLog->outFatal(LOG_FILTER_UNITS, "Unit %u is not able to release its charm " UI64FMTD, GetEntry(), GetCharmGUID());
97079707
}
97089708

9709-
bool Unit::isPossessedByPlayer() const
9709+
bool Unit::isPossessedByPlayer() const
97109710
{
9711-
return HasUnitState(UNIT_STATE_POSSESSED) && IS_PLAYER_GUID(GetCharmerGUID());
9711+
return HasUnitState(UNIT_STATE_POSSESSED) && IS_PLAYER_GUID(GetCharmerGUID());
97129712
}
97139713

97149714
bool Unit::isPossessing(Unit* u) const
97159715
{
9716-
return u->isPossessed() && GetCharmGUID() == u->GetGUID();
9716+
return u->isPossessed() && GetCharmGUID() == u->GetGUID();
97179717
}
97189718

97199719
bool Unit::isPossessing() const
@@ -12139,7 +12139,7 @@ bool Unit::IsAlwaysDetectableFor(WorldObject const* seer) const
1213912139

1214012140
bool Unit::IsVisible() const
1214112141
{
12142-
return (m_serverSideVisibility.GetValue(SERVERSIDE_VISIBILITY_GM) > SEC_PLAYER) ? false : true;
12142+
return (m_serverSideVisibility.GetValue(SERVERSIDE_VISIBILITY_GM) > SEC_PLAYER) ? false : true;
1214312143
}
1214412144

1214512145
void Unit::SetVisible(bool x)
@@ -14361,9 +14361,9 @@ SpellSchoolMask Unit::GetMeleeDamageSchoolMask() const
1436114361
return SPELL_SCHOOL_MASK_NORMAL;
1436214362
}
1436314363

14364-
uint64 Unit::GetCharmerOrOwnerGUID() const
14364+
uint64 Unit::GetCharmerOrOwnerGUID() const
1436514365
{
14366-
return GetCharmerGUID() ? GetCharmerGUID() : GetOwnerGUID();
14366+
return GetCharmerGUID() ? GetCharmerGUID() : GetOwnerGUID();
1436714367
}
1436814368

1436914369
uint64 Unit::GetCharmerOrOwnerOrOwnGUID() const
@@ -15968,8 +15968,8 @@ void Unit::RestoreFaction()
1596815968
}
1596915969

1597015970
Unit* Unit::GetRedirectThreatTarget()
15971-
{
15972-
return _redirectThreadInfo.GetTargetGUID() ? GetUnit(*this, _redirectThreadInfo.GetTargetGUID()) : NULL;
15971+
{
15972+
return _redirectThreadInfo.GetTargetGUID() ? GetUnit(*this, _redirectThreadInfo.GetTargetGUID()) : NULL;
1597315973
}
1597415974

1597515975
bool Unit::CreateVehicleKit(uint32 id, uint32 creatureEntry)
@@ -16000,9 +16000,9 @@ void Unit::RemoveVehicleKit()
1600016000
RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_PLAYER_VEHICLE);
1600116001
}
1600216002

16003-
bool Unit::IsOnVehicle(const Unit* vehicle) const
16004-
{
16005-
return m_vehicle && m_vehicle == vehicle->GetVehicleKit();
16003+
bool Unit::IsOnVehicle(const Unit* vehicle) const
16004+
{
16005+
return m_vehicle && m_vehicle == vehicle->GetVehicleKit();
1600616006
}
1600716007

1600816008
Unit* Unit::GetVehicleBase() const
@@ -17085,8 +17085,8 @@ bool Unit::UpdatePosition(float x, float y, float z, float orientation, bool tel
1708517085
}
1708617086

1708717087
bool Unit::UpdatePosition(const Position &pos, bool teleport)
17088-
{
17089-
return UpdatePosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), teleport);
17088+
{
17089+
return UpdatePosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), teleport);
1709017090
}
1709117091

1709217092
//! Only server-side orientation update, does not broadcast to client

0 commit comments

Comments
 (0)