From 13144a08e496b89b34093ffd3d810d3442df3c44 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Thu, 14 May 2020 23:15:35 +0100 Subject: Enable some more clang-tidy linter checks (#4738) * Avoid inefficient AString -> c_str() -> AString round trip * Avoid redundant string init expressions * Avoid unnecessary return, continue, etc. * Add .clang-format to help with clang-tidy fix-its * Avoid unnecessary passing by value * Avoid unnecessary local copying * Avoid copying in range-for loops * Avoid over-complicated boolean expressions * Some violations missed by my local clang-tidy * Allow unnecessary continue statements * Add brackets * Another expression missed locally * Move BindingsProcessor call into clang-tidy.sh and add space * Fix pushd not found error * Different grouping of CheckBlockInteractionRate --- src/Entities/Entity.cpp | 10 ++++------ src/Entities/LeashKnot.cpp | 1 - src/Entities/Player.cpp | 12 +++--------- src/Entities/Player.h | 2 +- 4 files changed, 8 insertions(+), 17 deletions(-) (limited to 'src/Entities') diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 55df8b834..5c444f74a 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -617,7 +617,6 @@ int cEntity::GetRawDamageAgainst(const cEntity & a_Receiver) void cEntity::ApplyArmorDamage(int DamageBlocked) { // cEntities don't necessarily have armor to damage. - return; } @@ -2041,11 +2040,10 @@ bool cEntity::IsA(const char * a_ClassName) const bool cEntity::IsAttachedTo(const cEntity * a_Entity) const { - if ((m_AttachedTo != nullptr) && (a_Entity->GetUniqueID() == m_AttachedTo->GetUniqueID())) - { - return true; - } - return false; + return ( + (m_AttachedTo != nullptr) && + (a_Entity->GetUniqueID() == m_AttachedTo->GetUniqueID()) + ); } diff --git a/src/Entities/LeashKnot.cpp b/src/Entities/LeashKnot.cpp index 2c91c5613..7ed4845b7 100644 --- a/src/Entities/LeashKnot.cpp +++ b/src/Entities/LeashKnot.cpp @@ -85,7 +85,6 @@ void cLeashKnot::KilledBy(TakeDamageInfo & a_TDI) Super::KilledBy(a_TDI); m_World->BroadcastSoundEffect("entity.leashknot.break", GetPosition(), 1, 1); Destroy(); - return; } diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index b38e987bd..d5d9f49af 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -86,7 +86,7 @@ const int cPlayer::EATING_TICKS = 30; -cPlayer::cPlayer(cClientHandlePtr a_Client, const AString & a_PlayerName) : +cPlayer::cPlayer(const cClientHandlePtr & a_Client, const AString & a_PlayerName) : Super(etPlayer, 0.6, 1.8), m_bVisible(true), m_FoodLevel(MAX_FOOD_LEVEL), @@ -1869,14 +1869,8 @@ bool cPlayer::PermissionMatches(const AStringVector & a_Permission, const AStrin } // So far all the sub-items have matched - // If the sub-item count is the same, then the permission matches: - if (lenP == lenT) - { - return true; - } - - // There are more sub-items in either the permission or the template, not a match: - return false; + // If the sub-item count is the same, then the permission matches + return (lenP == lenT); } diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 592b91546..11d448b11 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -48,7 +48,7 @@ public: CLASS_PROTODEF(cPlayer) - cPlayer(cClientHandlePtr a_Client, const AString & a_PlayerName); + cPlayer(const cClientHandlePtr & a_Client, const AString & a_PlayerName); virtual bool Initialize(OwnedEntity a_Self, cWorld & a_World) override; -- cgit v1.2.3