summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/directn.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-12-24 00:34:10 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-12-24 00:34:10 +0000
commit532d8dccff760d21593d5db61275e1d00a6af25b (patch)
tree188fcabf63080533db43ac1fb12d4c3c5b6c8c39 /crawl-ref/source/directn.cc
parenteef6876fa455bad0e5cec08fd8b39a5d602328b7 (diff)
downloadcrawl-ref-532d8dccff760d21593d5db61275e1d00a6af25b.tar.gz
crawl-ref-532d8dccff760d21593d5db61275e1d00a6af25b.zip
Fix re-do/repeat command not working with commands that targetted a monster.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7926 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/directn.cc')
-rw-r--r--crawl-ref/source/directn.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index f07d04864c..335ce7d016 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -370,25 +370,25 @@ static void _direction_again(dist& moves, targeting_type restricts,
{
moves.isCancel = true;
- crawl_state.cancel_cmd_repeat("You can no longer see the dungeon "
- "square you previously targeted.");
+ crawl_state.cancel_cmd_all("You can no longer see the dungeon "
+ "square you previously targeted.");
return;
}
else if (you.prev_grd_targ == you.pos())
{
moves.isCancel = true;
- crawl_state.cancel_cmd_repeat("You are now standing on your "
- "previously targeted dungeon "
- "square.");
+ crawl_state.cancel_cmd_all("You are now standing on your "
+ "previously targeted dungeon "
+ "square.");
return;
}
else if (!_is_target_in_range(you.prev_grd_targ, range))
{
moves.isCancel = true;
- crawl_state.cancel_cmd_repeat("Your previous target is now out of "
- "range.");
+ crawl_state.cancel_cmd_all("Your previous target is now out of "
+ "range.");
return;
}
@@ -416,16 +416,16 @@ static void _direction_again(dist& moves, targeting_type restricts,
{
moves.isCancel = true;
- crawl_state.cancel_cmd_repeat("Your target is gone.");
+ crawl_state.cancel_cmd_all("Your target is gone.");
return;
}
- else if (!_is_target_in_range(you.prev_grd_targ, range))
+ else if (!_is_target_in_range(montarget->pos(), range))
{
moves.isCancel = true;
- crawl_state.cancel_cmd_repeat("Your previous target is now out of "
- "range.");
+ crawl_state.cancel_cmd_all("Your previous target is now out of "
+ "range.");
return;
}