diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-27 02:50:20 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-27 02:50:20 +0000 |
| commit | a4e12b931bb08f5d6fc4e61508bf87623941b4be (patch) | |
| tree | 98f50468a387ef6d2edd638803feb212001bdf00 /crawl-ref/source | |
| parent | 97720dfdecf3a5a3063f7d833b670d309014cd0a (diff) | |
| download | crawl-ref-a4e12b931bb08f5d6fc4e61508bf87623941b4be.tar.gz crawl-ref-a4e12b931bb08f5d6fc4e61508bf87623941b4be.zip | |
Use "!Q" inscription to force a prompt before quivering an item instead of
"!f".
Update docs on addition of "!Q", on "!z" changing to "!Z" and "!E"
changing to "!v", and on "=f" preventing an item from being auto-quivered.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6163 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/enum.h | 5 | ||||
| -rw-r--r-- | crawl-ref/source/invent.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/quiver.cc | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index aba77bf568..9b1f3023b0 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2192,11 +2192,12 @@ enum operation_types OPER_READ = 'r', OPER_MEMORISE = 'M', OPER_ZAP = 'Z', - OPER_EXAMINE = 'v', + OPER_EXAMINE = 'x', OPER_FIRE = 'f', OPER_PRAY = 'p', - OPER_EVOKE = 'E', + OPER_EVOKE = 'v', OPER_DESTROY = 'D', + OPER_QUIVER = 'Q', OPER_ANY = 0 }; diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index 2ba2af30b1..7bc3b3732b 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -1245,6 +1245,7 @@ static std::string _operation_verb(operation_types oper) case OPER_PRAY: return "sacrifice"; case OPER_EVOKE: return "evoke"; case OPER_DESTROY: return "destroy"; + case OPER_QUIVER: return "quiver"; case OPER_ANY: default: return "choose"; diff --git a/crawl-ref/source/quiver.cc b/crawl-ref/source/quiver.cc index aa9f38e768..521923133e 100644 --- a/crawl-ref/source/quiver.cc +++ b/crawl-ref/source/quiver.cc @@ -144,7 +144,7 @@ void choose_item_for_quiver() int slot = prompt_invent_item( "Quiver which item? (- for none, * to show all)", MT_INVLIST, OSEL_THROWABLE, true, true, true, '-', NULL, - OPER_FIRE ); + OPER_QUIVER ); if (slot == PROMPT_ABORT) { |