summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2006-12-27 08:33:07 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2006-12-27 08:33:07 +0000
commitea7120cb96a4f1f5d3464f8bf2a615c2d8da2905 (patch)
tree5cbba5ec82869fecd92a5cc9aee93dbf533ae9a0
parent3ed21f0fc5596f76827ebb644b919a4cefb01bef (diff)
downloadcrawl-ref-ea7120cb96a4f1f5d3464f8bf2a615c2d8da2905.tar.gz
crawl-ref-ea7120cb96a4f1f5d3464f8bf2a615c2d8da2905.zip
Menu browsing should not have easy_exit set (Darshan.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@707 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/dungeon.cc2
-rw-r--r--crawl-ref/source/menu.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index ec9ea36d71..c4e9a6fc92 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -472,7 +472,7 @@ int items( int allow_uniques, // not just true-false,
int icky = 0;
int p = 0;
- // find an emtpy slot for the item (with culling if required)
+ // find an empty slot for the item (with culling if required)
p = get_item_slot(10);
if (p == NON_ITEM)
return (NON_ITEM);
diff --git a/crawl-ref/source/menu.h b/crawl-ref/source/menu.h
index c2d9651734..b7194385f8 100644
--- a/crawl-ref/source/menu.h
+++ b/crawl-ref/source/menu.h
@@ -435,7 +435,7 @@ int linebreak_string( std::string& s, int wrapcol, int maxcol );
class menu_browser : public Menu
{
public:
- menu_browser() {}
+ menu_browser() { flags &= (~MF_EASY_EXIT); }
protected:
virtual bool process_key( int keyin );
bool jump_to( int linenum );