diff options
| author | Aokromes <Aokromes@users.noreply.github.com> | 2019-07-08 12:51:42 +0200 |
|---|---|---|
| committer | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-07-08 12:51:42 +0200 |
| commit | 574a7c8d3d5f5a5660295deb70e905cf4dd756c4 (patch) | |
| tree | e82828fb825b4f04cb841dc6cb53945d46fc15cc /src/server/game/Entities/Object | |
| parent | 84b7b2e08ea55575cbe62d795383d4a5341ffd4d (diff) | |
Core/Misc: More coding standards (#23519)
* Core/Misc: More coding standards
* revert part
* "void " or more to "void "
* fix? reject
* remove more double whitespaces
* remove more double whitespaces
* more standards
* more coding standards
* More standards
* more coding
* more coding standards
* more coding standards
* And more standards
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.h | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index cef6b44ede9..40c35f45a0d 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -3088,7 +3088,7 @@ void WorldObject::GetPlayerListInGrid(Container& playerContainer, float maxSearc Cell::VisitWorldObjects(this, searcher, maxSearchRange); } -void WorldObject::GetNearPoint2D(WorldObject const* searcher, float &x, float &y, float distance2d, float absAngle) const +void WorldObject::GetNearPoint2D(WorldObject const* searcher, float& x, float& y, float distance2d, float absAngle) const { float effectiveReach = GetCombatReach(); @@ -3117,7 +3117,7 @@ void WorldObject::GetNearPoint2D(WorldObject const* searcher, float &x, float &y Trinity::NormalizeMapCoord(y); } -void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y, float &z, float distance2d, float absAngle) const +void WorldObject::GetNearPoint(WorldObject const* searcher, float& x, float& y, float& z, float distance2d, float absAngle) const { GetNearPoint2D(searcher, x, y, distance2d, absAngle); z = GetPositionZ(); @@ -3152,10 +3152,10 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y, z = first_z; } -void WorldObject::GetClosePoint(float &x, float &y, float &z, float size, float distance2d /*= 0*/, float relAngle /*= 0*/) const +void WorldObject::GetClosePoint(float& x, float& y, float& z, float size, float distance2d /*= 0*/, float relAngle /*= 0*/) const { // angle calculated from current orientation - GetNearPoint(nullptr, x, y, z, distance2d+size, GetOrientation() + relAngle); + GetNearPoint(nullptr, x, y, z, distance2d + size, GetOrientation() + relAngle); } Position WorldObject::GetNearPosition(float dist, float angle) diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index ed49c7ba121..74aedaee912 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -262,14 +262,14 @@ class FlaggedValuesArray32 m_flags = 0; } - T_FLAGS GetFlags() const { return m_flags; } - bool HasFlag(FLAG_TYPE flag) const { return m_flags & (1 << flag); } - void AddFlag(FLAG_TYPE flag) { m_flags |= (1 << flag); } - void DelFlag(FLAG_TYPE flag) { m_flags &= ~(1 << flag); } + T_FLAGS GetFlags() const { return m_flags; } + bool HasFlag(FLAG_TYPE flag) const { return m_flags & (1 << flag); } + void AddFlag(FLAG_TYPE flag) { m_flags |= (1 << flag); } + void DelFlag(FLAG_TYPE flag) { m_flags &= ~(1 << flag); } T_VALUES GetValue(FLAG_TYPE flag) const { return m_values[flag]; } - void SetValue(FLAG_TYPE flag, T_VALUES value) { m_values[flag] = value; } - void AddValue(FLAG_TYPE flag, T_VALUES value) { m_values[flag] += value; } + void SetValue(FLAG_TYPE flag, T_VALUES value) { m_values[flag] = value; } + void AddValue(FLAG_TYPE flag, T_VALUES value) { m_values[flag] += value; } private: T_VALUES m_values[ARRAY_SIZE]; @@ -289,15 +289,15 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation void AddToWorld() override; void RemoveFromWorld() override; - void GetNearPoint2D(WorldObject const* searcher, float &x, float &y, float distance, float absAngle) const; - void GetNearPoint(WorldObject const* searcher, float &x, float &y, float &z, float distance2d, float absAngle) const; - void GetClosePoint(float &x, float &y, float &z, float size, float distance2d = 0, float relAngle = 0) const; + void GetNearPoint2D(WorldObject const* searcher, float& x, float& y, float distance, float absAngle) const; + void GetNearPoint(WorldObject const* searcher, float& x, float& y, float& z, float distance2d, float absAngle) const; + void GetClosePoint(float& x, float& y, float& z, float size, float distance2d = 0, float relAngle = 0) const; void MovePosition(Position &pos, float dist, float angle); Position GetNearPosition(float dist, float angle); void MovePositionToFirstCollision(Position &pos, float dist, float angle); Position GetFirstCollisionPosition(float dist, float angle); Position GetRandomNearPosition(float radius); - void GetContactPoint(WorldObject const* obj, float &x, float &y, float &z, float distance2d = CONTACT_DISTANCE) const; + void GetContactPoint(WorldObject const* obj, float& x, float& y, float& z, float distance2d = CONTACT_DISTANCE) const; virtual float GetCombatReach() const { return 0.0f; } // overridden (only) in Unit void UpdateGroundPositionZ(float x, float y, float &z) const; |
