From 5733a0e18238e706064014dae7a6f24f84c696c6 Mon Sep 17 00:00:00 2001 From: ZhilkinSerg Date: Tue, 15 Oct 2019 16:43:17 +0300 Subject: [PATCH] Fix astyle regression (2019-10-15) (#34772) * Fix astyle regression * Simplify boolean expression --- src/item.cpp | 6 +----- src/martialarts.cpp | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/item.cpp b/src/item.cpp index a7c7003d9ae7b..aff624fbe8e3f 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -7067,11 +7067,7 @@ bool item::burn( fire_data &frd ) ( 3.0 * type->volume ) ); } - if( charges <= 0 ) { - return true; - } else { - return false; - } + return charges <= 0; } if( is_corpse() ) { diff --git a/src/martialarts.cpp b/src/martialarts.cpp index 5a138850d8227..19a2dac2bb465 100644 --- a/src/martialarts.cpp +++ b/src/martialarts.cpp @@ -1311,7 +1311,7 @@ std::string ma_technique::get_description() const if( disarms ) { dump << _( "* Will disarm the target" ) << std::endl; } - + if( take_weapon ) { dump << _( "* Will disarm the target and take their weapon" ) << std::endl;