summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-03 16:18:02 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-03 16:18:02 +0000
commit2c2a0304ec8308f912860f05dc1099b86f71773c (patch)
tree26a30495b0700fcb595aeafb7b3149c9f73d18d6 /crawl-ref/source/player.cc
parent1127ccc6b5bd418aead10e6b968aeef4d6909551 (diff)
downloadcrawl-ref-2c2a0304ec8308f912860f05dc1099b86f71773c.tar.gz
crawl-ref-2c2a0304ec8308f912860f05dc1099b86f71773c.zip
* Fix centaur/naga tiles not being displayed correctly in the character
selection menu. * Add dolls_data to player_save_info struct, to make it easier to read in per-character doll information once we get around to that. Including the tiledef files in externs.h is probably overkill, though, so we might want to move player_save_info into another header file. * Fix Xom's repel stair effect moving shops. * Fix decks granting permanent summons at low power (and only at low power). * Make default settings of the brand options consistent between init.txt and initfile.cc. * Update FAQ. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10086 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 0003c3774f..492e5219a5 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -327,6 +327,7 @@ bool move_player_to_grid( const coord_def& p, bool stepped, bool allow_shift,
command_type stair_dir = grid_stair_direction(new_grid);
if (stepped && stair_dir != CMD_NO_CMD
+ && new_grid != DNGN_ENTER_SHOP
&& you.duration[DUR_REPEL_STAIRS_MOVE])
{
int pct;