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, 3 deletions

diff --git a/crawl-ref/source/mtransit.cc b/crawl-ref/source/mtransit.cc
index d76b3e13c3..51ca767e98 100644
--- a/crawl-ref/source/mtransit.cc
+++ b/crawl-ref/source/mtransit.cc
@@ -204,7 +204,7 @@ void place_transiting_items()
 
     for (item = ilist.begin(); item != ilist.end(); item++)
     {
-        coord_def pos(item->x, item->y);
+        coord_def pos = item->pos;
 
         if (!in_bounds(pos))
         {
@@ -284,7 +284,7 @@ bool follower::place(bool near_player)
             mprf(MSGCH_DIAGNOSTICS, "Placed follower: %s",
                  m.name(DESC_PLAIN).c_str());
 #endif
-            m.target_x = m.target_y = 0;
+            m.target.reset();
 
             m.flags &= ~MF_TAKING_STAIRS;
             m.flags |= MF_JUST_SUMMONED;
@@ -315,7 +315,7 @@ void follower::restore_mons_items(monsters &m)
 
             item_def &it = mitm[islot];
             it = items[i];
-            it.x = it.y = 0;
+            it.pos.reset();
             it.link = NON_ITEM;
         }
     }