Skip to content

Commit

Permalink
Fixed "Activating items near character with empty hands and 0 volume …
Browse files Browse the repository at this point in the history
…capacity does not (always) work #33473"

The volume does not matter if the character can wield the item (has empty hands).
  • Loading branch information
ipcyborg committed Aug 23, 2019
1 parent 156c7a6 commit 2c4b5d7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/game_inventory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ class pickup_inventory_preset : public inventory_selector_preset
if( !p.has_item( *loc ) ) {
if( loc->made_of_from_type( LIQUID ) ) {
return _( "Can't pick up spilt liquids" );
} else if( !p.can_pickVolume( *loc ) ) {
} else if( !p.can_pickVolume( *loc ) && p.is_armed() ) {
return _( "Too big to pick up" );
} else if( !p.can_pickWeight( *loc ) ) {
return _( "Too heavy to pick up" );
Expand Down

0 comments on commit 2c4b5d7

Please sign in to comment.