Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upadd draw item query when wielding holster #23116
Conversation
illi-kun
reviewed
Mar 3, 2018
|
|
||
| // Query whether to draw an item from a holster when attempting to wield the holster | ||
| if( target.get_use( "holster" ) && ( target.contents.size() > 0 ) ) { | ||
| if( query_yn( string_format( _( "Draw %s from %s?" ), target.get_contained().tname().c_str(), target.get_contained().tname().c_str()) ) ) { |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
illi-kun
Mar 3, 2018
Member
BTW, this line itself is way too long, please target on 100 symbols max in one line (see astyle rules for details).
ymber
added some commits
Mar 3, 2018
illi-kun
reviewed
Mar 3, 2018
|
|
||
| // Query whether to draw an item from a holster when attempting to wield the holster | ||
| if( target.get_use( "holster" ) && ( target.contents.size() > 0 ) ) | ||
| { |
This comment has been minimized.
This comment has been minimized.
illi-kun
Mar 3, 2018
Member
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
illi-kun
reviewed
Mar 3, 2018
| if( target.get_use( "holster" ) && ( target.contents.size() > 0 ) ) | ||
| { | ||
| if( query_yn( string_format( _( "Draw %s from %s?" ), | ||
| target.get_contained().tname().c_str(), |
This comment has been minimized.
This comment has been minimized.
illi-kun
Mar 3, 2018
•
Member
... 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.
This comment has been minimized.
This comment has been minimized.
|
Current styling is what I got from the astyle instructions in CODE_STYLE.md. Is that outdated? |
This comment has been minimized.
This comment has been minimized.
|
I've compared .astylerc with |
This comment has been minimized.
This comment has been minimized.
|
I got it. It was formatting differently because I cut the new section out and astyled it on its own in a different file. Updated it as astyled properly. |
This comment has been minimized.
This comment has been minimized.
|
Great, thanks. |
ymber commentedMar 3, 2018
closes #19865
Queries whether to draw the item from a holster you attempt to wield if it contains anything.