diff options
author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-19 15:56:30 +0000 |
---|---|---|
committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-19 15:56:30 +0000 |
commit | 6f1723502bba926fdbffe9d5a5d632c285792716 (patch) | |
tree | 8ff903f4de28ee91de0cb692e67789cd24a44a82 /crawl-ref/source/player.h | |
parent | bd188fd76ce16ab6ba0c3be8d8e29976f1ee4d3d (diff) | |
download | crawl-ref-6f1723502bba926fdbffe9d5a5d632c285792716.tar.gz crawl-ref-6f1723502bba926fdbffe9d5a5d632c285792716.zip |
[2021920] Fixing issue where swapping into a fire elemental and cancelling due to the cloud still moved the fire elemental but not the player.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6609 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.h')
-rw-r--r-- | crawl-ref/source/player.h | 2 |
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 ); |