Make nextcell and movehalfcell methods of geom::ray.

Seems sensible given they modify the ray, even if it's not really
something intrinsic to a ray.

1 files changed, 4 insertions, 4 deletions

diff --git a/crawl-ref/source/ray.cc b/crawl-ref/source/ray.cc
index 32b9531fd5..e0fa416f91 100644
--- a/crawl-ref/source/ray.cc
+++ b/crawl-ref/source/ray.cc
@@ -40,23 +40,23 @@ bool ray_def::advance()
     if (on_corner)
     {
         on_corner = false;
-        geom::movehalfcell(r, diamonds);
+        r.move_half_cell(diamonds);
     }
     else
     {
         // Starting inside a diamond.
-        bool c = !geom::nextcell(r, diamonds);
+        bool c = !r.to_next_cell(diamonds);
 
         if (c)
         {
             // r is now on a corner, going from diamond to diamond.
-            geom::movehalfcell(r, diamonds);
+            r.move_half_cell(diamonds);
             return (false);
         }
     }
     // Now inside a non-diamond.
 
-    if (geom::nextcell(r, diamonds))
+    if (r.to_next_cell(diamonds))
         return (true);
     else
     {