diff options
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 5b62dabf80..6a93a94b73 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1416,9 +1416,15 @@ static void _input() if (need_to_autoinscribe()) autoinscribe(); + // XXX: Is there some smart way to avoid autoswitching back if we're + // just about to continue butchering? if (i_feel_safe() && you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED]) { - weapon_switch(you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED]); + int weap = you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED]; + if (weap == ENDOFPACK) + weap = -1; + + weapon_switch(weap); print_stats(); // To prevent spam in case the weapon can't be switched back to. |