summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-03 13:29:27 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-03 15:27:26 +0100
commit31c79607507ed1c1db3162fe3165fe15c7fcb9ee (patch)
tree6fa451d5e4a099033f997219b790da32d1c198f6 /crawl-ref
parent938f201e9125222ed10ef7db216d168cbb12605a (diff)
downloadcrawl-ref-31c79607507ed1c1db3162fe3165fe15c7fcb9ee.tar.gz
crawl-ref-31c79607507ed1c1db3162fe3165fe15c7fcb9ee.zip
Bug fixes.
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/beam.cc2
-rw-r--r--crawl-ref/source/ray.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index f45af3db48..457a21917f 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -1634,7 +1634,7 @@ void bolt::bounce()
bounce_pos = ray.pos();
reflect_grid rg;
- for (adjacent_iterator ai(ray.pos()); ai; ++ai)
+ for (adjacent_iterator ai(ray.pos(), false); ai; ++ai)
rg(*ai - ray.pos() + rg_o) = feat_is_solid(grd(*ai));
ray.bounce(rg);
range_used += 2;
diff --git a/crawl-ref/source/ray.cc b/crawl-ref/source/ray.cc
index b76db73562..69d43f5da8 100644
--- a/crawl-ref/source/ray.cc
+++ b/crawl-ref/source/ray.cc
@@ -311,7 +311,7 @@ void ray_def::bounce(const reflect_grid &rg)
r.dir = rtrans.dir;
ASSERT(_valid());
- ASSERT(rg(pos() - old_pos));
+ ASSERT(!rg(pos() - old_pos + rg_o));
}
void ray_def::regress()