Merge pull request #37047 from Trioct/drug_fix

Fix using drugs
CleverRaven · Jan 19, 2020 · fb9dabb · fb9dabb
2 parents 9ee0415 + 4779f93
commit fb9dabb
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/player.cpp b/src/player.cpp
@@ -4823,10 +4823,10 @@ void player::use( item_location loc )
                used.type->can_use( "CATTLEFODDER" ) ) {
         invoke_item( &used, loc.position() );
 
-    } else if( !used.is_craft() && !used.type->has_use() && ( used.is_food() ||
-               used.is_medication() ||
-               used.get_contained().is_food() ||
-               used.get_contained().is_medication() ) ) {
+    } else if( !used.is_craft() && ( used.is_medication() || ( !used.type->has_use() &&
+                                     ( used.is_food() ||
+                                       used.get_contained().is_food() ||
+                                       used.get_contained().is_medication() ) ) ) ) {
         consume( loc );
 
     } else if( used.is_book() ) {