diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-27 04:22:32 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-27 04:22:32 +0000 |
| commit | f155d043cb1e2e9b11dca676d6b470d081627499 (patch) | |
| tree | 4d3fcc5c391066da9c50daae9d35967a82863311 | |
| parent | a77e1d86ee4ce3d49c49750bee70a0fabfcf17a1 (diff) | |
| download | crawl-ref-f155d043cb1e2e9b11dca676d6b470d081627499.tar.gz crawl-ref-f155d043cb1e2e9b11dca676d6b470d081627499.zip | |
Fix a few more potential monster positioning problems.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9251 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 15 | ||||
| -rw-r--r-- | crawl-ref/source/mtransit.cc | 5 |
2 files changed, 10 insertions, 10 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index b2934c1f58..16f034d2be 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -6209,15 +6209,18 @@ bool monsters::find_place_near_player() bool monsters::find_home_anywhere() { - int tries = 600; - do + coord_def place(-1, -1); + int nvalid = 0; + for (int tries = 0; tries < 600; ++tries) { - position.set(random_range(6, GXM - 7), random_range(6, GYM - 7)); + if (check_set_valid_home(random_in_bounds(), place, nvalid)) + { + moveto(place); + return (true); + } } - while ((grd(pos()) != DNGN_FLOOR || mgrd(pos()) != NON_MONSTER) - && tries-- > 0); - return (tries >= 0); + return (false); } bool monsters::find_place_to_live(bool near_player) diff --git a/crawl-ref/source/mtransit.cc b/crawl-ref/source/mtransit.cc index 45f4c9ba3e..6f04a51138 100644 --- a/crawl-ref/source/mtransit.cc +++ b/crawl-ref/source/mtransit.cc @@ -208,10 +208,7 @@ void place_transiting_items() coord_def pos = item->pos; if (!in_bounds(pos)) - { - pos.x = random_range(X_BOUND_1 + 1, X_BOUND_2 - 1); - pos.y = random_range(Y_BOUND_1 + 1, Y_BOUND_2 - 1); - } + pos = random_in_bounds(); const coord_def where_to_go = dgn_find_nearby_stair(DNGN_ESCAPE_HATCH_DOWN, |