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, 8 insertions, 15 deletions

diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc
index c9f00ece2d..ad112415f9 100644
--- a/crawl-ref/source/stuff.cc
+++ b/crawl-ref/source/stuff.cc
@@ -399,18 +399,11 @@ static int follower_tag_radius2()
 {
     // If only friendlies are adjacent, we set a max radius of 6, otherwise
     // only adjacent friendlies may follow.
-    coord_def p;
-    for (p.x = you.x_pos - 1; p.x <= you.x_pos + 1; ++p.x)
-        for (p.y = you.y_pos - 1; p.y <= you.y_pos + 1; ++p.y)
-        {
-            if (p == you.pos())
-                continue;
-            if (const monsters *mon = monster_at(p))
-            {
-                if (!mons_friendly(mon))
-                    return (2);
-            }
-        }
+    for ( adjacent_iterator ai; ai; ++ai )
+        if (const monsters *mon = monster_at(*ai))
+            if (!mons_friendly(mon))
+                return (2);
+
     return (6 * 6);
 }
 
@@ -1285,8 +1278,8 @@ void random_in_bounds( int &x_pos, int &y_pos, int terr,
                  && grd[x_pos][y_pos] == DNGN_SHALLOW_WATER)
             done = true;
         else if (empty
-                && mgrd[x_pos][y_pos] != NON_MONSTER
-                && (x_pos != you.x_pos || y_pos != you.y_pos))
+                 && mgrd[x_pos][y_pos] != NON_MONSTER
+                 && (coord_def(x_pos,y_pos) != you.pos()))
         {
             done = true;
         }
@@ -1633,7 +1626,7 @@ void zap_los_monsters()
             if (!map_bounds(gx, gy))
                 continue;
 
-            if (gx == you.x_pos && gy == you.y_pos)
+            if (gx == you.pos().x && gy == you.pos().y)
                 continue;
 
             int imon = mgrd[gx][gy];