summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ouch.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-04-23 02:03:10 -0400
committerNeil Moore <neil@s-z.org>2014-04-23 02:04:08 -0400
commitc3d5cf6d3f59eed0bbbb7263bdd7c2bcac345be1 (patch)
tree91da65248973b19818acb44b04baa73c89c32a95 /crawl-ref/source/ouch.cc
parentb09f9d74bf7de2665faa52379781d8d5d150f3a7 (diff)
downloadcrawl-ref-c3d5cf6d3f59eed0bbbb7263bdd7c2bcac345be1.tar.gz
crawl-ref-c3d5cf6d3f59eed0bbbb7263bdd7c2bcac345be1.zip
Revert "Add argument check for check_your_resists (floatingatoll, #8416)"
_print_resist_messages in fact passes the "bad" argument combination. This reverts commit 940360b8b1c021b547c330e6c9fe1d2f112f8734.
Diffstat (limited to 'crawl-ref/source/ouch.cc')
-rw-r--r--crawl-ref/source/ouch.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index cc0f78d2aa..c5ac75fed4 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -114,8 +114,6 @@ int check_your_resists(int hurted, beam_type flavour, string source,
int resist;
int original = hurted;
- ASSERT(beam || !doEffects);
-
dprf("checking resistance: flavour=%d", flavour);
string kaux = "";