diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:50:12 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:50:12 -0800 |
| commit | 4c91abd6a020ee030114ae3f22d8f6066e7528be (patch) | |
| tree | 9f76256eabe4900a7eef6cbb94b7ed2378b93f48 /src/map/battle.cpp | |
| parent | 0a202555d2e12866b3619af92f50cb38ea4adb12 (diff) | |
| parent | 711680d652a8db17c1b91428b6d6835f30dfb4fd (diff) | |
| download | tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.gz tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.bz2 tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.xz tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.zip | |
Merge remote-tracking branch 'origin/hotfix'
Conflicts:
src/map/chrif.cpp
Diffstat (limited to 'src/map/battle.cpp')
| -rw-r--r-- | src/map/battle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.cpp b/src/map/battle.cpp index 88fcc07..0a6ffa7 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -1400,7 +1400,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) @@ -1921,7 +1921,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)) { |