diff options
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 73 | ||||
| -rw-r--r-- | crawl-ref/source/view.cc | 4 |
2 files changed, 36 insertions, 41 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index c5e56b1038..a3d8e3a601 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -2111,54 +2111,49 @@ static coord_def _random_monster_nearby_habitable_space(const monsters& mon, coord_def target; int tries; - { - // Save LOS, because we're going to clobber it with monster LOS. - unwind_var<env_show_grid> visible_grid(env.show); - // Do the clobbering. - losight(env.show, grd, mon.pos(), true); + for (tries = 0; tries < 150; ++tries) + { + const coord_def delta(random2(13) - 6, random2(13) - 6); - for (tries = 0; tries < 150; ++tries) - { - const coord_def delta(random2(14), random2(14)); + // Check that we don't get something too close to the + // starting point. + if (delta.origin()) + continue; - // Check that we don't get something too close to the - // starting point. - if (delta.origin()) - continue; + if (delta.rdist() == 1 && !allow_adjacent) + continue; - if (delta.rdist() == 1 && !allow_adjacent) - continue; + // Update target. + target = delta + mon.pos(); - // Update target. - target = delta + mon.pos(); + // Check that the target is valid and survivable. + if (!in_bounds(target)) + continue; - // Check that the target is valid and survivable. - if (!in_bounds(target)) - continue; + if (!monster_habitable_grid(&mon, grd(target))) + continue; - if (!monster_habitable_grid(&mon, grd(target))) - continue; + if (respect_sanctuary && is_sanctuary(target)) + continue; - if (respect_sanctuary && is_sanctuary(target)) - continue; + if (target == you.pos()) + continue; - // Check that we didn't go through clear walls. - if (num_feats_between(target, mon.pos(), - DNGN_CLEAR_ROCK_WALL, - DNGN_CLEAR_PERMAROCK_WALL, - true, true) > 0) - { - continue; - } + // Check that we didn't go through clear walls. + if (num_feats_between(mon.pos(), target, + DNGN_CLEAR_ROCK_WALL, + DNGN_CLEAR_PERMAROCK_WALL, + true, true) > 0) + { + continue; + } - // Note that this uses the clobbered LOS! - if (respect_los && !see_grid(target)) - continue; + if (respect_los && !mon.mon_see_grid(target)) + continue; - // Survived everything, break out (with a good value of target.) - break; - } + // Survived everything, break out (with a good value of target.) + break; } if (tries == 150) @@ -2197,7 +2192,7 @@ bool random_near_space(const coord_def& origin, coord_def& target, { // This might involve ray tracing (via num_feats_between()), so // cache results to avoid duplicating ray traces. - FixedArray<bool, 14, 14> tried; + FixedArray<bool, 13, 13> tried; tried.init(false); // Is the monster on the other side of a transparent wall? @@ -2216,7 +2211,7 @@ bool random_near_space(const coord_def& origin, coord_def& target, int tries = 0; while (tries++ < 150) { - coord_def delta(random2(14), random2(14)); + coord_def delta(random2(13), random2(13)); target = origin - coord_def(6, 6) + delta; diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 365fd5eaed..dce2984de8 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -2919,8 +2919,8 @@ void losight(env_show_grid &sh, const int realx = xmult * compressed_ray_x[rayidx]; const int realy = ymult * compressed_ray_y[rayidx]; // update shadow map - if (x_p + realx >= 0 && x_p + realx < 80 - && y_p + realy >= 0 && y_p + realy < 70 + if (x_p + realx >= 0 && x_p + realx < GXM + && y_p + realy >= 0 && y_p + realy < GYM && realx * realx + realy * realy <= los_radius_squared) { sh[sh_xo+realx][sh_yo+realy] = gr[x_p+realx][y_p+realy]; |