summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.h
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-19 16:02:35 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-19 16:02:35 +0000
commit7cfae909af95fc2a633a0aa25e5d644677fe4a52 (patch)
tree5a513a40d8acc40f90b615e07e964ec2f2d0c994 /crawl-ref/source/player.h
parente58388c7925c5572450709785f83f8901fbeecef (diff)
downloadcrawl-ref-7cfae909af95fc2a633a0aa25e5d644677fe4a52.tar.gz
crawl-ref-7cfae909af95fc2a633a0aa25e5d644677fe4a52.zip
Applying r6609 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6610 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.h')
-rw-r--r--crawl-ref/source/player.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h
index a1bd79ac52..b5c3a0bc39 100644
--- a/crawl-ref/source/player.h
+++ b/crawl-ref/source/player.h
@@ -28,7 +28,7 @@ enum genus_type
};
bool move_player_to_grid( int x, int y, bool stepped, bool allow_shift,
- bool force );
+ bool force, bool swapping = false );
bool player_in_mappable_area(void);
bool player_in_branch( int branch );