summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ray.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-03 19:32:27 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-03 21:19:08 +0100
commit91c5ceb9a384513509dbb941992347f4c92efc86 (patch)
treebf2b5001a588134ebd8bca1ebc54f4a5bdfde57f /crawl-ref/source/ray.cc
parent8910118eef56319a5071eee2c9acba0a09bea356 (diff)
downloadcrawl-ref-91c5ceb9a384513509dbb941992347f4c92efc86.tar.gz
crawl-ref-91c5ceb9a384513509dbb941992347f4c92efc86.zip
Move regress next to advance.
Diffstat (limited to 'crawl-ref/source/ray.cc')
-rw-r--r--crawl-ref/source/ray.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/ray.cc b/crawl-ref/source/ray.cc
index 9a0810d78d..78cc133df6 100644
--- a/crawl-ref/source/ray.cc
+++ b/crawl-ref/source/ray.cc
@@ -165,6 +165,15 @@ bool ray_def::advance()
return (!on_corner);
}
+void ray_def::regress()
+{
+ ASSERT(_valid());
+ r.dir = -r.dir;
+ advance();
+ r.dir = -r.dir;
+ ASSERT(_valid());
+}
+
static geom::vector _mirror_pt(const geom::vector &vorig, const coord_def &side)
{
geom::vector v = vorig;
@@ -374,12 +383,3 @@ void ray_def::bounce(const reflect_grid &rg)
ASSERT(_valid());
ASSERT(!rg(pos() - old_pos + rg_o));
}
-
-void ray_def::regress()
-{
- ASSERT(_valid());
- r.dir = -r.dir;
- advance();
- r.dir = -r.dir;
- ASSERT(_valid());
-}