diff options
| author | Brendan Hickey <brendan@bhickey.net> | 2013-04-28 23:26:25 -0700 |
|---|---|---|
| committer | Brendan Hickey <brendan@bhickey.net> | 2013-04-28 23:54:23 -0700 |
| commit | 23222fdd521c999d61b2cbdee7fe4d87a234cf8c (patch) | |
| tree | b23dd3877fd266625ceb389873a9bd94d7379951 /crawl-ref/source/random-var.cc | |
| parent | 926959ac5bd809f4014e5ad2f47bbe778e5760e8 (diff) | |
| download | crawl-ref-23222fdd521c999d61b2cbdee7fe4d87a234cf8c.tar.gz crawl-ref-23222fdd521c999d61b2cbdee7fe4d87a234cf8c.zip | |
Refactor ASSERT(a && b) -> ASSERT(a); ASSERT(b);
Convert conjunctive assertions into separate assertions. This ought to be correctness preserving. I ran the stress tests and didn't notice anything unusual. While I have confidence in it, if you are the slightest bit suspicious of this, please roll it back.
Found instances with `ASSERT(\([^(|]*\) && \([^)|]*\))`
Manually inspected each instance.
Diffstat (limited to 'crawl-ref/source/random-var.cc')
| -rw-r--r-- | crawl-ref/source/random-var.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/random-var.cc b/crawl-ref/source/random-var.cc index 04b19db0a1..0c401daed0 100644 --- a/crawl-ref/source/random-var.cc +++ b/crawl-ref/source/random-var.cc @@ -59,7 +59,8 @@ void random_var::init() int random_var::roll2val(int r) const { - ASSERT(0 <= r && r < total); + ASSERT(0 <= r); + ASSERT(r < total); int v = start; int w = weight(v); while (r >= w) |