Belatedly apply merge fix.

CleverRaven · Nov 9, 2013 · 77e5f36 · 77e5f36
1 parent 338923b
commit 77e5f36
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/melee.cpp b/melee.cpp
@@ -942,9 +942,9 @@ void player::perform_technique(ma_technique technique, game *g, monster *z,
 // this would be i2amroy's fix, but it's kinda handy
 bool player::can_weapon_block()
 {
-	return (weapon.has_technique("WBLOCK_1", this) ||
-         weapon.has_technique("WBLOCK_2", this) ||
-         weapon.has_technique("WBLOCK_3", this));
+    return (weapon.has_technique("WBLOCK_1") ||
+            weapon.has_technique("WBLOCK_2") ||
+            weapon.has_technique("WBLOCK_3"));
 }
 
 bool player::block_hit(game *g, monster *z, player *p, body_part &bp_hit, int &side,