summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-12-29 10:48:02 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-12-29 10:48:02 +0000
commit10a49dc866d7cb5b0d5fe0400ae02f30e8be4d85 (patch)
tree4833ed04517e9f26c21031fcc6fed0c34fad67b6 /crawl-ref
parent2cc1fcd4c22999a035ce33eada216055a63b3cc7 (diff)
downloadcrawl-ref-10a49dc866d7cb5b0d5fe0400ae02f30e8be4d85.tar.gz
crawl-ref-10a49dc866d7cb5b0d5fe0400ae02f30e8be4d85.zip
Oops, my last change broke _monster_swaps_places().
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8010 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/monstuff.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 83da543cf5..795b825621 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -7116,9 +7116,9 @@ static bool _monster_swaps_places( monsters *mon, const coord_def& delta )
// Okay, do the swap!
_swim_or_move_energy(mon);
- mon->moveto(n);
+ mon->pos() = n;
mgrd(n) = monster_index(mon);
- m2->moveto(c);
+ m2->pos() = c;
const int m2i = monster_index(m2);
ASSERT(m2i >= 0 && m2i < MAX_MONSTERS);
mgrd(c) = m2i;