summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/direct.cc6
-rw-r--r--crawl-ref/source/item_use.cc8
2 files changed, 12 insertions, 2 deletions
diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc
index 917e7e313a..3e74133ff0 100644
--- a/crawl-ref/source/direct.cc
+++ b/crawl-ref/source/direct.cc
@@ -446,6 +446,12 @@ void direction(dist& moves, targeting_type restricts,
}
else
{
+ if (!needs_path)
+ {
+ mprf(MSGCH_EXAMINE_FILTER, "This spell doesn't need a beam path.");
+ break;
+ }
+
show_beam = find_ray(you.x_pos, you.y_pos, moves.tx, moves.ty,
true, ray, 0, true);
need_beam_redraw = show_beam;
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 );