diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-18 01:29:33 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-18 01:29:33 +0000 |
| commit | e558b0503312ea313b9a0303b74cce435500f119 (patch) | |
| tree | 6a28390f9b93a307fbc9c90518ce6458533e41f1 /crawl-ref/source/ouch.cc | |
| parent | dfb4f758b542dac6147dc5284e51b3875469e36e (diff) | |
| download | crawl-ref-e558b0503312ea313b9a0303b74cce435500f119.tar.gz crawl-ref-e558b0503312ea313b9a0303b74cce435500f119.zip | |
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
Diffstat (limited to 'crawl-ref/source/ouch.cc')
| -rw-r--r-- | crawl-ref/source/ouch.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index 53c0021c81..881216ee1a 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -899,8 +899,12 @@ void ouch(int dam, int death_source, kill_method_type death_type, } // Also don't kill wizards testing Xom acts. - if (crawl_state.prev_cmd == CMD_WIZARD && you.religion != GOD_XOM) + if ((crawl_state.repeat_cmd == CMD_WIZARD + || crawl_state.prev_cmd == CMD_WIZARD) + && you.religion != GOD_XOM) + { return; + } // Okay, you *didn't* escape death. you.reset_escaped_death(); |