Skip to content

Commit

Permalink
Fix astyle regression (2019-10-15) (CleverRaven#34772)
Browse files Browse the repository at this point in the history
* Fix astyle regression

* Simplify boolean expression
  • Loading branch information
ZhilkinSerg authored and Ramza13 committed Oct 16, 2019
1 parent 32f1ef1 commit 5733a0e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 1 addition & 5 deletions src/item.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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() ) {
Expand Down
2 changes: 1 addition & 1 deletion src/martialarts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@ std::string ma_technique::get_description() const
if( disarms ) {
dump << _( "* Will <info>disarm</info> the target" ) << std::endl;
}

if( take_weapon ) {
dump << _( "* Will <info>disarm</info> the target and <info>take their weapon</info>" ) <<
std::endl;
Expand Down

0 comments on commit 5733a0e

Please sign in to comment.