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/ray.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/ray.cc')
| -rw-r--r-- | crawl-ref/source/ray.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/ray.cc b/crawl-ref/source/ray.cc index 92fbfac797..c297cde658 100644 --- a/crawl-ref/source/ray.cc +++ b/crawl-ref/source/ray.cc @@ -413,7 +413,8 @@ static geom::form _corner_wall(const coord_def &side, const reflect_grid &rg) e = coord_def(1, 0); else e = coord_def(0, 1); - ASSERT(!rg(coord_def(0,0)) && rg(side)); + ASSERT(!rg(coord_def(0,0))); + ASSERT(rg(side)); // Reflect back by an orthogonal wall... coord_def wall = e; // unless the wall is clearly diagonal: |