diff options
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/delay.cc | 16 | ||||
| -rw-r--r-- | crawl-ref/source/state.cc | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index bc99032034..73f9b9ff86 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -1740,14 +1740,6 @@ static bool _should_stop_activity(const delay_queue_item &item, if (ai == AI_FULL_HP || ai == AI_FULL_MP) { - // No recursive interruptions from messages (AI_MESSAGE) - _block_interruptions(true); - if (ai == AI_FULL_HP) - mpr("HP restored."); - else - mpr("Magic restored."); - _block_interruptions(false); - if (Options.rest_wait_both && curr == DELAY_REST && (you.magic_points < you.max_magic_points || you.hp < you.hp_max)) @@ -1920,6 +1912,14 @@ bool interrupt_activity( activity_interrupt_type ai, // First try to stop the current delay. const delay_queue_item &item = you.delay_queue.front(); + // No recursive interruptions from messages (AI_MESSAGE) + _block_interruptions(true); + if (ai == AI_FULL_HP) + mpr("HP restored."); + else if (ai == AI_FULL_MP) + mpr("Magic restored."); + _block_interruptions(false); + if (_should_stop_activity(item, ai, at)) { // no monster will attack you inside a sanctuary, diff --git a/crawl-ref/source/state.cc b/crawl-ref/source/state.cc index 682119512b..d63fa8f201 100644 --- a/crawl-ref/source/state.cc +++ b/crawl-ref/source/state.cc @@ -215,7 +215,7 @@ bool interrupt_cmd_repeat( activity_interrupt_type ai, return (true); } - // If command repitition is being used to immitate the rest command, + // If command repetition is being used to imitate the rest command, // then everything interrupts it. if (crawl_state.repeat_cmd == CMD_MOVE_NOWHERE || crawl_state.repeat_cmd == CMD_SEARCH) @@ -472,7 +472,7 @@ void game_state::dump(FILE* file) if (cmd_repeat_count > 0 || cmd_repeat_goal > 0) { - fprintf(file, "Doing command repitition:" EOL); + fprintf(file, "Doing command repetition:" EOL); fprintf(file, "cmd_repeat_start:%d, cmd_repeat_count: %d, " "cmd_repeat_goal:%d" EOL "prev_cmd_repeat_goal: %d" EOL, |