From cf82459f23b7c1ab62ad91bdb242a9d56081bbf4 Mon Sep 17 00:00:00 2001 From: Darshan Shaligram Date: Mon, 4 Jan 2010 01:55:36 +0530 Subject: Fix two-weaponing monsters throwing their offhand weapon in combat. --- crawl-ref/source/mon-stuff.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc index 1395161b51..43db612472 100644 --- a/crawl-ref/source/mon-stuff.cc +++ b/crawl-ref/source/mon-stuff.cc @@ -3337,10 +3337,12 @@ int mons_pick_best_missile(monsters *mons, item_def **launcher, if (launch && missiles && !missiles->launched_by(*launch)) launch = NULL; + const int n_usable_melee_weapons(mons_wields_two_weapons(mons) ? 2 : 1); const int tdam = mons_thrown_weapon_damage( melee, - melee_weapon_count == 1 && melee->quantity == 1); + melee_weapon_count == n_usable_melee_weapons + && melee->quantity == 1); const int fdam = mons_missile_damage(mons, launch, missiles); if (!tdam && !fdam) -- cgit v1.2.3-54-g00ecf