diff options
| author | Brendan Hickey <brendan@bhickey.net> | 2013-11-15 22:09:48 -0800 |
|---|---|---|
| committer | Brendan Hickey <brendan@bhickey.net> | 2013-11-15 22:23:40 -0800 |
| commit | 88d061b7451307158b7e9cf8c83cd09e2ee3c283 (patch) | |
| tree | f115d2b8bb33c44136bb0f8fdb6df03e5a499758 /crawl-ref/source/mon-chimera.cc | |
| parent | 02d7e00d420071eed54ccd5a13dff0137a22ee52 (diff) | |
| download | crawl-ref-88d061b7451307158b7e9cf8c83cd09e2ee3c283.tar.gz crawl-ref-88d061b7451307158b7e9cf8c83cd09e2ee3c283.zip | |
Refactor ASSERT(a && b) again
This commit converts ASSERT(a && b) to ASSERT(a); ASSERT(b);
Assertions of the form !(a && b) are left intact, since there isn't an
obvious readability gain over (!a || !b).
Diffstat (limited to 'crawl-ref/source/mon-chimera.cc')
| -rw-r--r-- | crawl-ref/source/mon-chimera.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-chimera.cc b/crawl-ref/source/mon-chimera.cc index 283295ac05..b600dff361 100644 --- a/crawl-ref/source/mon-chimera.cc +++ b/crawl-ref/source/mon-chimera.cc @@ -269,8 +269,10 @@ string monster_info::chimera_part_names() const monster_type chimtype2 = static_cast<monster_type>(props["chimera_part_2"].get_int()); monster_type chimtype3 = static_cast<monster_type>(props["chimera_part_3"].get_int()); - ASSERT(chimtype2 > MONS_PROGRAM_BUG && chimtype2 < NUM_MONSTERS); - ASSERT(chimtype3 > MONS_PROGRAM_BUG && chimtype3 < NUM_MONSTERS); + ASSERT(chimtype2 > MONS_PROGRAM_BUG); + ASSERT(chimtype2 < NUM_MONSTERS); + ASSERT(chimtype3 > MONS_PROGRAM_BUG); + ASSERT(chimtype3 < NUM_MONSTERS); ostringstream s; s << ", " << get_monster_data(chimtype2)->name |