diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-24 20:35:38 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-24 20:35:38 +0000 |
| commit | 1c7b2ac28e9d5a45bc90cdcf2bf2945c2f0c0dc0 (patch) | |
| tree | 914b61455e96d5affc9473586ed4a7ed002cb2e1 | |
| parent | 6054a9251a852b63fc2e16cf628a09c9640417c3 (diff) | |
| download | crawl-ref-1c7b2ac28e9d5a45bc90cdcf2bf2945c2f0c0dc0.tar.gz crawl-ref-1c7b2ac28e9d5a45bc90cdcf2bf2945c2f0c0dc0.zip | |
Trunk->0.3 merge (2912): No prompt for stepping on traps when confused.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2913 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/player.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index efacc4313a..2a8e58117e 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -125,7 +125,7 @@ bool move_player_to_grid( int x, int y, bool stepped, bool allow_shift, // return (false); // if we're walking along, give a chance to avoid trap - if (stepped && !force) + if (stepped && !force && !you.confused()) { if (new_grid == DNGN_UNDISCOVERED_TRAP) { |