From 94516a290b1daf710ac29f21da5cd3855d1b2d8c Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rvollmert@gmx.net>
Date: Tue, 3 Nov 2009 10:42:20 +0100
Subject: Possibly fix diagonal corridor asserts.

---
 crawl-ref/source/ray.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'crawl-ref/source/ray.cc')

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
     {
-- 
cgit v1.2.3-54-g00ecf