From e558b0503312ea313b9a0303b74cce435500f119 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Sun, 18 Jan 2009 01:29:33 +0000 Subject: Tweaks to make it less likely that command repitition will be cancled when it's being used to wizard test Xom acts. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8525 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/player.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'crawl-ref/source/player.cc') diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 4cdf592454..e13ba99ba5 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -2994,6 +2994,9 @@ void gain_exp( unsigned int exp_gained, unsigned int* actual_gain, void level_change(bool skip_attribute_increase) { + const bool wiz_cmd = crawl_state.prev_cmd == CMD_WIZARD + || crawl_state.repeat_cmd == CMD_WIZARD; + // necessary for the time being, as level_change() is called // directly sometimes {dlb} you.redraw_experience = true; @@ -3003,14 +3006,9 @@ void level_change(bool skip_attribute_increase) { bool skip_more = false; - if (!skip_attribute_increase) + if (!skip_attribute_increase && !wiz_cmd) { - if (crawl_state.is_replaying_keys() - || crawl_state.is_repeating_cmd()) - { - crawl_state.cancel_cmd_repeat(); - crawl_state.cancel_cmd_again(); - } + crawl_state.cancel_cmd_all(); if (is_processing_macro()) flush_input_buffer(FLUSH_ABORT_MACRO); -- cgit v1.2.3-54-g00ecf