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/Blocks/BlockBed.cpp | 6 +----- src/Blocks/BlockFire.h | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'src/Blocks') diff --git a/src/Blocks/BlockBed.cpp b/src/Blocks/BlockBed.cpp index 6d50e8c41..dccbcde39 100644 --- a/src/Blocks/BlockBed.cpp +++ b/src/Blocks/BlockBed.cpp @@ -128,11 +128,7 @@ bool cBlockBedHandler::OnUse( // Fast-forward the time if all players in the world are in their beds: auto TimeFastForwardTester = [](cPlayer & a_OtherPlayer) { - if (!a_OtherPlayer.IsInBed()) - { - return true; - } - return false; + return !a_OtherPlayer.IsInBed(); }; if (a_WorldInterface.ForEachPlayer(TimeFastForwardTester)) { diff --git a/src/Blocks/BlockFire.h b/src/Blocks/BlockFire.h index a4b3d3a05..afc8ecf7a 100644 --- a/src/Blocks/BlockFire.h +++ b/src/Blocks/BlockFire.h @@ -167,8 +167,6 @@ public: } } } - - return; } /** Evaluates if coordinates are a portal going XP / XM; returns true if so, and writes boundaries to variable -- cgit v1.2.3