diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-12-05 11:38:28 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-12-05 11:38:28 +0000 |
| commit | f79914cddad049fc82f6dd3d4ff9dd34e4246f31 (patch) | |
| tree | 83e61421ff8e4e12807eca006508dcbfc4c7881d /crawl-ref | |
| parent | b6a0681ec1bdfcda102bef156549a0b727c21dd3 (diff) | |
| download | crawl-ref-f79914cddad049fc82f6dd3d4ff9dd34e4246f31.tar.gz crawl-ref-f79914cddad049fc82f6dd3d4ff9dd34e4246f31.zip | |
Miscellaneous items are }, not {.
travel_delay now defaults to 20ms.
drop_mode defaults to multi.
Fixed Enter not activating travel from stash menu.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@574 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/command.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/stash.cc | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index cbbee78e79..2b97cf1536 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -761,7 +761,7 @@ void list_commands(bool wizard) "<lightgrey>/</lightgrey> : wands (<w>z</w>ap)\n" "<lightcyan>+</lightcyan> : books (<w>r</w>ead, <w>M</w>emorise and <w>Z</w>ap)\n" "<brown>\\</brown> : staves and rods (<w>w</w>ield and <w>E</w>voke)\n" - "<lightgreen>{</lightgreen> : miscellaneous items (<w>E</w>voke)\n" + "<lightgreen>}</lightgreen> : miscellaneous items (<w>E</w>voke)\n" "<lightred>0</lightred> : the Orb of Zot\n" "\n" "<yellow>$</yellow> : gold\n" @@ -885,7 +885,7 @@ void list_commands(bool wizard) "<w>/</w> : selects wands\n" "<w>+</w> : selects books\n" "<w>\\</w> : selects staves\n" - "<w>{</w> : selects miscellaneous items\n" + "<w>}</w> : selects miscellaneous items\n" "Carry the Orb to the surface and win!\n" "<w>,</w> : global selection\n" "<w>-</w> : global deselection\n" diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index db16281baa..48ff80fb16 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -587,7 +587,7 @@ void game_options::reset_options() pickup_thrown = true; travel_colour = true; - travel_delay = 10; + travel_delay = 20; travel_stair_cost = 500; travel_exclude_radius2 = 68; @@ -642,7 +642,7 @@ void game_options::reset_options() dump_item_origins = IODS_ARTIFACTS | IODS_RODS; dump_item_origin_price = -1; - drop_mode = DM_SINGLE; + drop_mode = DM_MULTI; pickup_mode = -1; flush_input[ FLUSH_ON_FAILURE ] = true; diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc index 8efae5058d..ec1d189f44 100644 --- a/crawl-ref/source/stash.cc +++ b/crawl-ref/source/stash.cc @@ -347,6 +347,7 @@ class StashMenu : public InvMenu { public: StashMenu() : InvMenu(MF_SINGLESELECT), can_travel(false) { } + unsigned char getkey() const; public: bool can_travel; protected: @@ -381,6 +382,11 @@ bool StashMenu::process_key(int key) return Menu::process_key(key); } +unsigned char StashMenu::getkey() const +{ + return (lastch); +} + static MenuEntry *stash_menu_fixup(MenuEntry *me) { const item_def *item = static_cast<const item_def *>( me->data ); |