diff options
| author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-05 19:28:56 +0300 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-05 17:31:29 +0100 |
| commit | 48f785a271089f4f85bdfb5624b56b433e0ebd13 (patch) | |
| tree | 3eaeea9d8cfe68e9545478f6f50d4cdb3a5aaab7 /crawl-ref/source/misc.cc | |
| parent | 0dc3e02bc8bc01336bd9421257635b49d646502d (diff) | |
| download | crawl-ref-48f785a271089f4f85bdfb5624b56b433e0ebd13.tar.gz crawl-ref-48f785a271089f4f85bdfb5624b56b433e0ebd13.zip | |
Replace uses of player_is_airborne with you.airborne.
Signed-off-by: Robert Vollmert <rvollmert@gmx.net>
Diffstat (limited to 'crawl-ref/source/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 4e4e1cc76f..55650b1041 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -1303,7 +1303,7 @@ void search_around(bool only_adjacent) bool merfolk_change_is_safe(bool quiet) { // If already transformed, no subsequent transformation necessary. - if (!player_is_airborne() && feat_is_water(grd(you.pos()))) + if (!you.airborne() && feat_is_water(grd(you.pos()))) return (true); std::set<equipment_type> r; @@ -1346,21 +1346,21 @@ static void climb_message(dungeon_feature_type stair, bool going_up, { mprf("You %s downwards.", you.flight_mode() == FL_FLY ? "fly" : - (player_is_airborne() ? "float" : "slide")); + (you.airborne() ? "float" : "slide")); } } else if (feat_is_gate(stair)) { mprf("You %s %s through the gate.", you.flight_mode() == FL_FLY ? "fly" : - (player_is_airborne() ? "float" : "go"), + (you.airborne() ? "float" : "go"), going_up ? "up" : "down"); } else { mprf("You %s %swards.", you.flight_mode() == FL_FLY ? "fly" : - (player_is_airborne() ? "float" : "climb"), + (you.airborne() ? "float" : "climb"), going_up ? "up" : "down"); } } @@ -1802,7 +1802,7 @@ void up_stairs(dungeon_feature_type force_stair, // Since the overloaded message set turn_is_over, I'm assuming that // the overloaded character makes an attempt... so we're doing this // check before that one. -- bwr - if (!player_is_airborne() + if (!you.airborne() && you.confused() && old_level_type == LEVEL_DUNGEON && !feat_is_escape_hatch(stair_find) @@ -2345,7 +2345,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair, if (old_level_type != you.level_type && you.level_type == LEVEL_DUNGEON) mprf("Welcome back to %s!", branches[you.where_are_you].longname); - if (!player_is_airborne() + if (!you.airborne() && you.confused() && !feat_is_escape_hatch(stair_find) && force_stair != DNGN_ENTER_ABYSS |