summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-01 18:43:59 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-01 21:45:27 +0100
commit80034f54ceede032a5740e3ec96f87a31ee18c87 (patch)
treec7d2e3e98eb890ad987eefa199bb9b50b09a7a53
parent0ddf2cdcb915211928f9045791cbba249e96f858 (diff)
downloadcrawl-ref-80034f54ceede032a5740e3ec96f87a31ee18c87.tar.gz
crawl-ref-80034f54ceede032a5740e3ec96f87a31ee18c87.zip
Permit rays to go from diamond directly to diamond.
Also recenter the cardinal direction rays. Before, we didn't have centered rays going straight north/south or east/west, which was awkward for shift-firing.
-rw-r--r--crawl-ref/source/los.cc4
-rw-r--r--crawl-ref/source/ray.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/los.cc b/crawl-ref/source/los.cc
index 69be2ec42c..e67c364156 100644
--- a/crawl-ref/source/los.cc
+++ b/crawl-ref/source/los.cc
@@ -492,8 +492,8 @@ void raycast()
// register perpendiculars FIRST, to make them top choice
// when selecting beams
- _register_ray(geom::ray(0.6, 0.5, 0.0, 1.0));
- _register_ray(geom::ray(0.5, 0.6, 1.0, 0.0));
+ _register_ray(geom::ray(0.5, 0.5, 0.0, 1.0));
+ _register_ray(geom::ray(0.5, 0.5, 1.0, 0.0));
// For a slope of M = y/x, every x we move on the X axis means
// that we move y on the y axis. We want to look at the resolution
diff --git a/crawl-ref/source/ray.cc b/crawl-ref/source/ray.cc
index 64fb706bf3..fbcc655c39 100644
--- a/crawl-ref/source/ray.cc
+++ b/crawl-ref/source/ray.cc
@@ -104,7 +104,7 @@ bool ray_def::advance()
{
// r is now on a corner, going from diamond to diamond.
r.to_grid(diamonds, true);
- return (false);
+ return (true);
}
}