diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-06 14:43:57 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-06 14:43:57 +0000 |
| commit | f442b6f700fe5e6a588c802fbcab1b5bd0097627 (patch) | |
| tree | 7c7a85e8de26c5c1053c7b02406271b55fe5797c /crawl-ref/source/it_use3.cc | |
| parent | 8b4814cda94ce0ba5d627b4ae572077dcf55ccda (diff) | |
| download | crawl-ref-f442b6f700fe5e6a588c802fbcab1b5bd0097627.tar.gz crawl-ref-f442b6f700fe5e6a588c802fbcab1b5bd0097627.zip | |
Fix 1986261: patrolling monsters not interrupting their patrol to hunt
the player (Whoops!)
Fix 1945669: Monsters attacking via reaching still getting secondary
unarmed attacks.
And... we're down to one page of bug reports, yay! :D
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5500 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/it_use3.cc')
| -rw-r--r-- | crawl-ref/source/it_use3.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index 28598708e0..367ef11f85 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -251,7 +251,7 @@ void special_wielded() return; } // end special_wielded() -static bool reaching_weapon_attack(const item_def& wpn) +static bool _reaching_weapon_attack(const item_def& wpn) { dist beam; @@ -340,7 +340,7 @@ static bool reaching_weapon_attack(const item_def& wpn) you_attack(mgrd[beam.tx][beam.ty], false); return (true); -} // end reaching_weapon_attack() +} static bool evoke_horn_of_geryon() { @@ -460,13 +460,13 @@ bool evoke_wielded() case OBJ_WEAPONS: if (get_weapon_brand(wpn) == SPWPN_REACHING) { - if ( reaching_weapon_attack(wpn) ) + if (_reaching_weapon_attack(wpn)) { pract = 0; did_work = true; } else - return false; + return (false); } else if (is_fixed_artefact( wpn )) { |