diff options
| -rw-r--r-- | crawl-ref/source/acr.cc | 11 | ||||
| -rw-r--r-- | crawl-ref/source/delay.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/externs.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/travel.cc | 8 |
4 files changed, 21 insertions, 5 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 084f94c659..b3b5e27943 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -978,6 +978,11 @@ void process_command( command_type cmd ) { case CMD_MOVE_RIGHT: move_player( 1, 0); break; case CMD_REST: + if ( you.hp == you.hp_max && + you.magic_points == you.max_magic_points ) + mpr("You start searching."); + else + mpr("You start resting."); start_running( RDIR_REST, RMODE_REST_DURATION ); break; @@ -2216,7 +2221,8 @@ static void world_reacts() return; } -static command_type get_next_cmd() { +static command_type get_next_cmd() +{ if (Options.autoprayer_on && you.duration[DUR_PRAYER] == 0 && just_autoprayed == false && you.religion != GOD_NO_GOD && grid_altar_god( grd[you.x_pos][you.y_pos] ) == GOD_NO_GOD && @@ -2412,7 +2418,8 @@ static keycode_type numpad2vi(keycode_type key) } #endif -keycode_type get_next_keycode() { +keycode_type get_next_keycode() +{ keycode_type keyin; diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 329067ea34..5f5879ac15 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -735,6 +735,8 @@ static command_type get_running_command() { } if ( is_resting() ) { you.running.rest(); + if ( !is_resting() ) + mpr("Done searching."); return CMD_MOVE_NOWHERE; } return direction_to_command( you.running.x, you.running.y ); @@ -766,7 +768,8 @@ static void handle_run_delays(const delay_queue_item &delay) if (cmd != CMD_NO_CMD) { - mesclr(); + if ( delay.type != DELAY_REST ) + mesclr(); process_command(cmd); } diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index a502a47c46..a43f843e52 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -588,7 +588,7 @@ struct monsters int hit_points; int max_hit_points; int hit_dice; - int armour_class; // great -- more mixed american/proper spelling + int armour_class; int evasion; unsigned int speed; unsigned int speed_increment; diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index ffd12b9830..04ecd0b040 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -3341,12 +3341,18 @@ void runrest::clear() void runrest::check_hp() { if (is_rest() && you.hp == you.hp_max && you.hp > hp) + { + mpr("HP restored."); stop(); + } } void runrest::check_mp() { if (is_rest() && you.magic_points == you.max_magic_points && you.magic_points > mp) - stop(); + { + mpr("MP restored."); + stop(); + } } |