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

Jump to bottom

add draw item query when wielding holster #23116

Merged
merged 6 commits into from
Mar 3, 2018
Merged

add draw item query when wielding holster #23116

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e41bce
add draw item query when wielding holster
Mar 3, 2018
cbfbc21
fix string formatting
Mar 3, 2018
f3f14d4
reduce line length
Mar 3, 2018
e95f41c
fix string formatting properly
Mar 3, 2018
22515f5
astyle new code
Mar 3, 2018
c7cde46
astyle new code properly
Mar 3, 2018
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
12 changes: 12 additions & 0 deletions src/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7756,6 +7756,18 @@ bool player::wield( item& target )
if( target.is_null() ) {
return true;
}

// Query whether to draw an item from a holster when attempting to wield the holster
if( target.get_use( "holster" ) && ( target.contents.size() > 0 ) )
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't want to be annoying and don't want to discourage you from other PRs but it still wrong formatted. { should be on a previous line (see an example right above), and

if( query_yn( string_format( _( "Draw %s from %s?" ),
target.get_contained().tname().c_str(),
Copy link
Contributor

@illi-kun illi-kun Mar 3, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... and we need one more space here and on a line below.

If you feel it takes to much efforts to get minor improve then simply ignore it, it will not be a blocker, at least for me.

target.tname().c_str() ) ) ) {
invoke_item( &target );
return true;
}
}

// Wielding from inventory is relatively slow and does not improve with increasing weapon skill.
// Worn items (including guns with shoulder straps) are faster but still slower
// than a skilled player with a holster.
Expand Down