From 711680d652a8db17c1b91428b6d6835f30dfb4fd Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Wed, 19 Nov 2014 17:44:13 -0800
Subject: Magically allow "break" within WITH_VAR

---
 src/map/battle.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/map/battle.cpp')

diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index f852265..28c9d5f 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -1411,7 +1411,7 @@ struct Damage battle_calc_pc_weapon_attack(dumb_ptr<block_list> src,
 
     if (widx.ok())
     {
-        if OPTION_IS_SOME(sdidw, sd->inventory_data[widx])
+        if OPTION_IS_SOME_NOLOOP(sdidw, sd->inventory_data[widx])
             atkmin = atkmin * (80 + sdidw->wlv * 20) / 100;
     }
     if (sd->status.weapon == ItemLook::BOW)
@@ -1932,7 +1932,7 @@ ATK battle_weapon_attack(dumb_ptr<block_list> src, dumb_ptr<block_list> target,
             ItemNameId weapon;
             if (weapon_index.ok())
             {
-                if OPTION_IS_SOME(sdidw, sd->inventory_data[weapon_index])
+                if OPTION_IS_SOME_NOLOOP(sdidw, sd->inventory_data[weapon_index])
                 {
                     if (bool(sd->status.inventory[weapon_index].equip & EPOS::WEAPON))
                     {
-- 
cgit v1.2.3-70-g09d2