Apply suggestions from code review.

CleverRaven · Jun 10, 2020 · 7cf5015 · 7cf5015
1 parent aeba9ad
commit 7cf5015
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json
@@ -960,13 +960,13 @@
     "price_postapoc": 250,
     "bashing": 2,
     "cutting": 1,
-    "material": [ "leather", "cotton" ],
+    "material": [ "steel", "leather", "cotton" ],
     "symbol": "[",
     "looks_like": "gloves_leather",
     "color": "light_gray",
     "covers": [ "HANDS" ],
     "coverage": 100,
-    "encumbrance": 2,
+    "encumbrance": 5,
     "warmth": 5,
     "material_thickness": 2,
     "flags": [ "WATER_FRIENDLY", "STAB", "DURABLE_MELEE" ]

diff --git a/src/melee.cpp b/src/melee.cpp
@@ -442,7 +442,7 @@ void Character::melee_attack( Creature &t, bool allow_special, const matec_id &f
         }
 
         // Treat all gloves as unarmed weapons.
-        if( found_glove && !cur_weapon->has_flag( flag_UNARMED_WEAPON ) ) {
+        if( found_glove ) {
             cur_weapon->set_flag( flag_UNARMED_WEAPON );
             unarmed_flag_set = true;
         }