diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-04 09:58:31 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-04 09:58:31 +0000 |
| commit | 95e55a6b22e03054efbdf9af7625832883298a2d (patch) | |
| tree | 7b2c5f013f0e79017ad55d43f702bc47ac64db82 /crawl-ref/source/stuff.cc | |
| parent | 3db6df1d0ca8100864c3638521e89e352f6d0b8c (diff) | |
| download | crawl-ref-95e55a6b22e03054efbdf9af7625832883298a2d.tar.gz crawl-ref-95e55a6b22e03054efbdf9af7625832883298a2d.zip | |
Warn the player if interlevel travel is going to take them to a level outside the range [src,dest] (rax, doy).
Add ^G as an alias for Escape in yesno and yesnoquit.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6764 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/stuff.cc')
| -rw-r--r-- | crawl-ref/source/stuff.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index 8346cb4764..30157ceb84 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -1058,7 +1058,8 @@ bool yesno( const char *str, bool safe, int safeanswer, bool clear_after, tmp = map->find(tmp)->second; if (safeanswer - && (tmp == ' ' || tmp == 27 || tmp == '\r' || tmp == '\n')) + && (tmp == ' ' || tmp == ESCAPE || tmp == CONTROL('G') + || tmp == '\r' || tmp == '\n')) { tmp = safeanswer; } @@ -1153,7 +1154,7 @@ int yesnoquit( const char* str, bool safe, int safeanswer, bool allow_all, int tmp = getchm(KC_CONFIRM); - if (tmp == CK_ESCAPE || tmp == 'q' || tmp == 'Q') + if (tmp == CK_ESCAPE || tmp == CONTROL('G') || tmp == 'q' || tmp == 'Q') return -1; if ((tmp == ' ' || tmp == '\r' || tmp == '\n') && safeanswer) |