diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-05-06 19:39:20 -0600 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-05-07 18:23:34 -0600 |
| commit | f25431f1f0bb12d6d846ebff2a9f49d88f0472ee (patch) | |
| tree | 5a2bc3a1359efde3dca6d278c71f56580efabc98 /crawl-ref/source/uncancel.cc | |
| parent | 96155f285f40cdba3563b22b3d9a028a68e54326 (diff) | |
| download | crawl-ref-f25431f1f0bb12d6d846ebff2a9f49d88f0472ee.tar.gz crawl-ref-f25431f1f0bb12d6d846ebff2a9f49d88f0472ee.zip | |
Use uncancels for Gozag abilities.
Includes properly splitting the usability checks out of the function
itself.
Diffstat (limited to 'crawl-ref/source/uncancel.cc')
| -rw-r--r-- | crawl-ref/source/uncancel.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/crawl-ref/source/uncancel.cc b/crawl-ref/source/uncancel.cc index fc76f8c3f9..58862caa90 100644 --- a/crawl-ref/source/uncancel.cc +++ b/crawl-ref/source/uncancel.cc @@ -7,6 +7,7 @@ #include "AppHdr.h" #include "acquire.h" #include "decks.h" +#include "godabil.h" #include "libutil.h" #include "player.h" #include "state.h" @@ -61,6 +62,15 @@ void run_uncancels() return; break; + case UNC_POTION_PETITION: + if (!gozag_potion_petition() && crawl_state.seen_hups) + return; + break; + + case UNC_CALL_MERCHANT: + if (!gozag_call_merchant() && crawl_state.seen_hups) + return; + break; } if (act != -1) |