diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-20 07:24:17 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-20 07:24:17 +0000 |
| commit | 1733067254ea91e95f1e77015ec3fd71c6424186 (patch) | |
| tree | 234270c1688a19b998f67349a1661d4c135b1df3 /crawl-ref/source/player.cc | |
| parent | 75ffb38b0b37ff9e70d4bedf1607ba7e637fba48 (diff) | |
| download | crawl-ref-1733067254ea91e95f1e77015ec3fd71c6424186.tar.gz crawl-ref-1733067254ea91e95f1e77015ec3fd71c6424186.zip | |
Rename static methods in travel.cc and terrain.cc.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5146 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index a33f60f264..e7760c8972 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -121,8 +121,8 @@ bool move_player_to_grid( int x, int y, bool stepped, bool allow_shift, ASSERT( you.can_pass_through_feat( new_grid ) ); // better not be an unsubmerged monster either: - ASSERT( mgrd[x][y] == NON_MONSTER - || mons_is_submerged( &menv[ mgrd[x][y] ] )); + ASSERT(mgrd[x][y] == NON_MONSTER + || mons_is_submerged( &menv[ mgrd[x][y] ] )); const int cloud = env.cgrid[x][y]; if (cloud != EMPTY_CLOUD) @@ -382,8 +382,8 @@ bool is_grid_dangerous(int grid) bool player_in_mappable_area( void ) { - return (!(testbits(env.level_flags, LFLAG_NOT_MAPPABLE) - || testbits(get_branch_flags(), BFLAG_NOT_MAPPABLE))); + return (!testbits(env.level_flags, LFLAG_NOT_MAPPABLE) + && !testbits(get_branch_flags(), BFLAG_NOT_MAPPABLE)); } bool player_in_branch( int branch ) @@ -399,8 +399,8 @@ bool player_in_hell( void ) COMPILE_CHECK(BRANCH_LAST_HELL == BRANCH_THE_PIT, b); return (you.level_type == LEVEL_DUNGEON - && ( you.where_are_you >= BRANCH_FIRST_HELL - && you.where_are_you <= BRANCH_LAST_HELL) + && you.where_are_you >= BRANCH_FIRST_HELL + && you.where_are_you <= BRANCH_LAST_HELL && you.where_are_you != BRANCH_VESTIBULE_OF_HELL); } |