summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/uncancel.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2012-12-15 04:54:31 +0100
committerAdam Borowski <kilobyte@angband.pl>2012-12-16 00:35:25 +0100
commit129b971fb6ed8d2eec2abc1c9c69fd1e67cfc9cd (patch)
treef82a9d23909abbd068f17715fed59364eb530476 /crawl-ref/source/uncancel.cc
parente91f5400eec3bb272a9d33aff6d7e5ff9b00f204 (diff)
downloadcrawl-ref-129b971fb6ed8d2eec2abc1c9c69fd1e67cfc9cd.tar.gz
crawl-ref-129b971fb6ed8d2eec2abc1c9c69fd1e67cfc9cd.zip
Properly handle HUP on the mercenary card prompt.
Diffstat (limited to 'crawl-ref/source/uncancel.cc')
-rw-r--r--crawl-ref/source/uncancel.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/uncancel.cc b/crawl-ref/source/uncancel.cc
index 75cde589e9..dfd1b19c73 100644
--- a/crawl-ref/source/uncancel.cc
+++ b/crawl-ref/source/uncancel.cc
@@ -46,6 +46,12 @@ void run_uncancels()
if (!stack_five(arg) && crawl_state.seen_hups)
return;
break;
+
+ case UNC_MERCENARY:
+ if (!recruit_mercenary(arg) && crawl_state.seen_hups)
+ return;
+ break;
+
}
if (act != -1)