diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-09 08:15:34 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-09 08:15:34 +0000 |
| commit | b6543292ee56b2a1d038bae09e94bcc41c1bd6f6 (patch) | |
| tree | 6c5044b0d63878599dde877b37cceba4d5f8c080 | |
| parent | 6c492dfd5ae7208c5e26c720e64bc5e2a52c9d51 (diff) | |
| download | crawl-ref-b6543292ee56b2a1d038bae09e94bcc41c1bd6f6.tar.gz crawl-ref-b6543292ee56b2a1d038bae09e94bcc41c1bd6f6.zip | |
[1593089] Allow Escape to exit the sequential pickup prompt.
Moved notes to the end of the character dump.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@371 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/initfile.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/items.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index ce56d5b0fc..9d9bfa4ba8 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -631,8 +631,8 @@ void reset_options(bool clear_name) // Clear vector options. Options.dump_order.clear(); - add_dump_fields("header,stats,misc,notes,inventory,skills," - "spells,mutations,messages,screenshot,kills"); + add_dump_fields("header,stats,misc,inventory,skills," + "spells,mutations,messages,screenshot,kills,notes"); Options.banned_objects.clear(); Options.note_monsters.clear(); diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index c04516a5e4..16c1ab824c 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -1245,7 +1245,7 @@ void pickup() break; } - if (keyin == 'q') + if (keyin == 'q' || keyin == ESCAPE) break; if (keyin == 'y' || keyin == 'a') |