Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix astyle regression (2019-10-15) #34772

Merged
merged 2 commits into from
Oct 15, 2019
Merged

Fix astyle regression (2019-10-15) #34772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e95ff61
Fix astyle regression
ZhilkinSerg Oct 15, 2019
0de9925
Simplify boolean expression
ZhilkinSerg Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/item.cpp
View file
Open in desktop
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
View file
Open in desktop
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