From 88d00c26d2909136d0cb1df8d58e2b449ca91908 Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rvollmert@gmx.net>
Date: Tue, 3 Nov 2009 19:40:42 +0100
Subject: Improve reflections when starting in a corner.

---
 crawl-ref/source/ray.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/crawl-ref/source/ray.cc b/crawl-ref/source/ray.cc
index 78cc133df6..83b25d091c 100644
--- a/crawl-ref/source/ray.cc
+++ b/crawl-ref/source/ray.cc
@@ -282,20 +282,20 @@ void ray_def::bounce(const reflect_grid &rg)
     const coord_def old_pos = pos();
 #endif
 
-    if (on_corner)
-    {
-        // XXX
-        r.dir = -r.dir;
-        ASSERT(_valid());
-        return;
-    }
-
     // Translate to cell (0,0).
     geom::vector p(pos().x, pos().y);
     geom::ray rtrans;
     rtrans.start = r.start - p;
     rtrans.dir = r.dir;
 
+    if (on_corner)
+    {
+        // Move a little bit towards cell center (0.5, 0.5).
+       rtrans.start = 0.9 * rtrans.start + 0.1 * geom::vector(0.5, 0.5);
+       on_corner = false;
+       ASSERT(in_diamond_int(rtrans.start));
+    }
+
     // Move to the diamond edge to determine the side.
     coord_def side;
     bool corner = rtrans.to_grid(diamonds, false);
-- 
cgit v1.2.3-54-g00ecf