summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2009-12-27 18:32:52 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2009-12-27 18:36:02 +0530
commitbd29fc66d15166b3c34dcad3abaea54e0e3bacbc (patch)
treeab0ba297559ee5b482c03570fb90fdc4c0f9d880 /crawl-ref/source/player.cc
parent382a17cfc82a018bc2c071a6fed85150fe3d2154 (diff)
downloadcrawl-ref-bd29fc66d15166b3c34dcad3abaea54e0e3bacbc.tar.gz
crawl-ref-bd29fc66d15166b3c34dcad3abaea54e0e3bacbc.zip
Add tides to the Shoals.
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc14
1 files changed, 11 insertions, 3 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 4e5cf2dc77..e7e54c63d6 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -7031,6 +7031,17 @@ void player::moveto(const coord_def &c)
set_position(c);
}
+bool player::move_to_pos(const coord_def &c)
+{
+ actor *target = actor_at(c);
+ if (!target || target->submerged())
+ {
+ moveto(c);
+ return true;
+ }
+ return false;
+}
+
void player::shiftto(const coord_def &c)
{
crawl_view.shift_player_to(c);
@@ -7423,6 +7434,3 @@ void player::set_duration(duration_type dur, int turns,
you.duration[dur] = 0;
increase_duration(dur, turns, cap, msg);
}
-
-
-