diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-15 21:47:52 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-15 21:47:52 +0000 |
commit | 67eb7c2e6fd0b7504c76d7019611beae59c20ff4 (patch) | |
tree | 574c584ab8c6a937cdc8a7f953725bf4d06e5ba7 /crawl-ref/source/item_use.cc | |
parent | be3a188d2d063ce38289db5f96c66f218167d73a (diff) | |
download | crawl-ref-67eb7c2e6fd0b7504c76d7019611beae59c20ff4.tar.gz crawl-ref-67eb7c2e6fd0b7504c76d7019611beae59c20ff4.zip |
Fixed warning inscriptions for 'r' and 'P'.
Added a message when trying to look at the beam path
of a spell that doesn't need one. (AFAIK, it's only
spells that have this behaviour. Should this not be
the case, or should this ever change, the message
will have to be adapted.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2093 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r-- | crawl-ref/source/item_use.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 9ab722f446..5148cd9d65 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -2570,7 +2570,8 @@ bool puton_ring(int slot, bool prompt_finger) item_slot = slot; else item_slot = prompt_invent_item( "Put on which piece of jewellery?", - MT_INVLIST, OBJ_JEWELLERY ); + MT_INVLIST, OBJ_JEWELLERY, true, true, true, 0, NULL, + OPER_PUTON ); if (item_slot == PROMPT_ABORT) { @@ -3516,7 +3517,10 @@ void read_scroll(void) int item_slot = prompt_invent_item( "Read which item?", MT_INVLIST, - OBJ_SCROLLS ); + OBJ_SCROLLS, + true, true, true, 0, NULL, + OPER_READ ); + if (item_slot == PROMPT_ABORT) { canned_msg( MSG_OK ); |