summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/abyss.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/abyss.cc')
-rw-r--r--crawl-ref/source/abyss.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index e968f582b3..b6077ba081 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -488,13 +488,8 @@ void area_shift(void)
move_item_stack_to_grid( *ri, newpos );
// Move monster.
- mgrd(newpos) = mgrd(*ri);
- if (mgrd(*ri) != NON_MONSTER)
- {
- menv[mgrd(newpos)].x = newpos.x;
- menv[mgrd(newpos)].y = newpos.y;
- mgrd(*ri) = NON_MONSTER;
- }
+ if ( mgrd(*ri) != NON_MONSTER )
+ menv[mgrd(*ri)].moveto(newpos);
// Move cloud,
if (env.cgrid(*ri) != EMPTY_CLOUD)
@@ -506,7 +501,7 @@ void area_shift(void)
if (env.cloud[i].type == CLOUD_NONE)
continue;
- if ( grid_distance(abyss_center, env.cloud[i].pos()) > 10 )
+ if ( grid_distance(abyss_center, env.cloud[i].pos) > 10 )
delete_cloud( i );
}