diff options
Diffstat (limited to 'crawl-ref/source/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 6039265869..4e9c911c61 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -437,15 +437,15 @@ static void climb_message(dungeon_feature_type stair, bool going_up, mpr("A mysterious force pulls you upwards."); else { - mprf("You %s downwards.", you.flies()? "fly" : - (player_is_levitating()? "float" : + mprf("You %s downwards.", you.flight_mode() == FL_FLY? "fly" : + (player_is_airborne()? "float" : "slide")); } } else { - mprf("You %s %swards.", you.flies()? "fly" : - (player_is_levitating()? "float" : "climb"), + mprf("You %s %swards.", you.flight_mode() == FL_FLY? "fly" : + (player_is_airborne()? "float" : "climb"), going_up? "up": "down"); } } @@ -489,7 +489,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_levitating() + if (!player_is_airborne() && you.duration[DUR_CONF] && (stair_find >= DNGN_STONE_STAIRS_UP_I && stair_find <= DNGN_ROCK_STAIRS_UP) @@ -594,7 +594,7 @@ void up_stairs(dungeon_feature_type force_stair) const dungeon_feature_type stair_taken = stair_find; - if (player_is_levitating()) + if (player_is_airborne()) { if (you.duration[DUR_CONTROLLED_FLIGHT]) mpr("You fly upwards."); @@ -724,7 +724,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair ) return; } - if (!force_stair && you.flies() == FL_LEVITATE) + if (!force_stair && you.flight_mode() == FL_LEVITATE) { mpr("You're floating high up above the floor!"); return; @@ -871,7 +871,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair ) mprf("Welcome back to %s!", branches[you.where_are_you].longname); - if (!player_is_levitating() + if (!player_is_airborne() && you.duration[DUR_CONF] && (stair_find >= DNGN_STONE_STAIRS_DOWN_I && stair_find <= DNGN_ROCK_STAIRS_DOWN) |