diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-12 12:03:50 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-12 12:03:50 +0000 |
commit | 02ab6c3af9655d82ca2304a1f1f9248ce65b75a1 (patch) | |
tree | 282929cb4411d4f046ba0117c6c646df477e4d3f /crawl-ref | |
parent | b2cbc660557dc68072c5210ed0df7dd3da9f0589 (diff) | |
download | crawl-ref-02ab6c3af9655d82ca2304a1f1f9248ce65b75a1.tar.gz crawl-ref-02ab6c3af9655d82ca2304a1f1f9248ce65b75a1.zip |
Backport map edge fix to 0.5.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10181 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/docs/changes.stone_soup | 1 | ||||
-rw-r--r-- | crawl-ref/source/monstuff.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup index a4dc7b63ca..3e1a89bc33 100644 --- a/crawl-ref/docs/changes.stone_soup +++ b/crawl-ref/docs/changes.stone_soup @@ -5,6 +5,7 @@ Disclaimer: These are merely the highlights, not an exhaustive list of changes. * Improved performance for the Tiles version. * Fixed crashes related to giant spores. +* Fixed monsters refusing to enter or attack into grids on the map edge. * Fixed summoning decks giving permanent summons at low power. * Fixed erroneous "blocked line of fire" warnings. * Fixed missing items in Tiles inventory menus. diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 765cf04b97..2d95dbdd44 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -4809,7 +4809,7 @@ static void _handle_movement(monsters *monster) } // Bounds check: don't let fleeing monsters try to run off the grid. - const coord_def s = monster->target + mmov; + const coord_def s = monster->pos() + mmov; if (!in_bounds_x(s.x)) mmov.x = 0; if (!in_bounds_y(s.y)) |