diff options
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 23aa7cd34f..b6c372cd33 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1396,7 +1396,7 @@ static void _input() fire_monster_alerts(); - bool player_feels_safe = i_feel_safe(); + const bool player_feels_safe = i_feel_safe(); if (Options.tutorial_left) { @@ -1458,10 +1458,10 @@ static void _input() // XXX: Is there some smart way to avoid autoswitching back if we're // just about to continue butchering? - if (!you.turn_is_over && player_feels_safe + if (Options.swap_when_safe && !you.turn_is_over && player_feels_safe && you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED]) { - int weap = you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED]; + int weap = you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] - 1; if (weap == ENDOFPACK) weap = -1; |