diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-22 07:41:26 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-22 07:41:26 +0000 |
| commit | 49ed6aea2e8f3beb3217224618c64dfd1d42f5f3 (patch) | |
| tree | 484251e334741e0879af83d0a00cf9727ee783b0 /crawl-ref/source/religion.cc | |
| parent | 5a4705a1b7e91fabd88fab3785120e8a534b7820 (diff) | |
| download | crawl-ref-49ed6aea2e8f3beb3217224618c64dfd1d42f5f3.tar.gz crawl-ref-49ed6aea2e8f3beb3217224618c64dfd1d42f5f3.zip | |
Since you.turn_is_over is now always true once world_reacts() starts
processing, simplify the religion_turn_over() pre-condition assertion.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8686 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 7f86832094..82658e1ff0 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3127,7 +3127,7 @@ static FixedVector<bool, NUM_MONSTERS> _first_attack_was_friendly; void religion_turn_start() { - if (you.turn_is_over || you_are_delayed() || you.cannot_act()) + if (you.turn_is_over) religion_turn_end(); _first_attack_conduct.init(true); @@ -3138,7 +3138,7 @@ void religion_turn_start() void religion_turn_end() { - ASSERT(you.turn_is_over || you_are_delayed() || you.cannot_act()); + ASSERT(you.turn_is_over); _place_delayed_monsters(); } |