Massive overhaul to move towards coord_def().

This might have introduced some bugs: I now get intermittent crashes
on startup (this might have to do with the changes to special_room.)
Sorry about that - committing before I need to do any more big conflict
resolutions. Fixes coming later.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6732 c06c8d41-db1a-0410-9941-cceddc491573

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 );
     }