summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/directn.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-30 21:39:03 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-30 21:39:03 +0000
commit2e0507ac62fefe90c1b6a15af5f971d2892d5534 (patch)
tree43d3636738e25ef2ded30bfcd7e388d966b71d97 /crawl-ref/source/directn.cc
parentc735656f5d7982da59f3e81a1f487b559ba7bcda (diff)
downloadcrawl-ref-2e0507ac62fefe90c1b6a15af5f971d2892d5534.tar.gz
crawl-ref-2e0507ac62fefe90c1b6a15af5f971d2892d5534.zip
Force beams of digging (wand or spell, known or unknown, also /random
effects) to ignore the endpoint target ('.') in favour of continuing until the end of the range. Unrestrict tridents for some more species. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6265 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/directn.cc')
-rw-r--r--crawl-ref/source/directn.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 7b787fa0fa..8d3b268e00 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -276,11 +276,11 @@ static bool _is_target_in_range(int x, int y, int range)
// previous command differently (i.e., not just letting the keys
// stuffed into the macro buffer replay as-is) because if the player
// targeted a monster using the movement keys and the monster then
-// moved between repititions, then simply replaying the keys in the
+// moved between repetitions, then simply replaying the keys in the
// buffer will target an empty square.
-static void direction_again(dist& moves, targeting_type restricts,
- targ_mode_type mode, int range, bool just_looking,
- const char *prompt, targeting_behaviour *beh)
+static void _direction_again(dist& moves, targeting_type restricts,
+ targ_mode_type mode, int range, bool just_looking,
+ const char *prompt, targeting_behaviour *beh)
{
moves.isValid = false;
moves.isTarget = false;
@@ -471,8 +471,7 @@ static void _fill_monster_list(bool full_info)
void direction(dist& moves, targeting_type restricts,
targ_mode_type mode, int range, bool just_looking,
- bool needs_path, const char *prompt,
- targeting_behaviour *beh)
+ bool needs_path, const char *prompt, targeting_behaviour *beh)
{
static targeting_behaviour stock_behaviour;
if (!beh)
@@ -491,8 +490,8 @@ void direction(dist& moves, targeting_type restricts,
if (crawl_state.is_replaying_keys() && restricts != DIR_DIR)
{
- direction_again(moves, restricts, mode, range, just_looking,
- prompt, beh);
+ _direction_again(moves, restricts, mode, range, just_looking,
+ prompt, beh);
return;
}