summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ray.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-03 10:42:20 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-03 10:42:20 +0100
commit94516a290b1daf710ac29f21da5cd3855d1b2d8c (patch)
tree87ee11e90867c5616c7a259dec5dd5e89773c527 /crawl-ref/source/ray.cc
parente65199ef20df7201e5cb1a87e3e0fffdfd13523d (diff)
downloadcrawl-ref-94516a290b1daf710ac29f21da5cd3855d1b2d8c.tar.gz
crawl-ref-94516a290b1daf710ac29f21da5cd3855d1b2d8c.zip
Possibly fix diagonal corridor asserts.
Diffstat (limited to 'crawl-ref/source/ray.cc')
-rw-r--r--crawl-ref/source/ray.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/ray.cc b/crawl-ref/source/ray.cc
index baef1b0f03..0951a1c0a2 100644
--- a/crawl-ref/source/ray.cc
+++ b/crawl-ref/source/ray.cc
@@ -95,6 +95,7 @@ coord_def ray_def::pos() const
static bool _advance_from_non_diamond(geom::ray *r)
{
+ ASSERT(in_non_diamond_int(r->start));
if (!r->to_next_cell(diamonds))
{
ASSERT(in_diamond_int(r->start));
@@ -228,7 +229,7 @@ void ray_def::bounce(const reflect_grid &rg)
// Tricky case: diagonal corridor.
// TODO: Implement this.
rmirr.dir = -rmirr.dir;
- _advance_from_non_diamond(&rmirr);
+ r.to_grid(diamonds, true);
}
else
{