Fix bug introduced in r6347 (oops): igrd wasn't being cleaned when moving.

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

2 files changed, 4 insertions, 6 deletions

diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index d3c23c8243..9a128f3a58 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -530,15 +530,11 @@ void area_shift(void)
 
     _xom_check_nearness();
 
-    // Can't re-use ri since you.pos() has changed.
-    radius_iterator ri2(you.pos(), LOS_RADIUS);
-    for ( ; ri2; ++ri2 )
-        env.map(*ri2).property = fprops(you.pos() - *ri2 + los_delta);
+    for ( radius_iterator ri(you.pos(), LOS_RADIUS); ri; ++ri )
+        env.map(*ri).property = fprops(you.pos() - *ri + los_delta);
 
     if (sanct_shifted)
-    {
         env.sanctuary_pos = sanct_pos + you.pos();
-    }
 
     mgen_data mons;
     mons.level_type = LEVEL_ABYSS;
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index eba72e9f7b..ff0731d68f 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -595,6 +595,7 @@ void lose_item_stack( int x, int y )
             si->clear();
         }
     }
+    igrd[x][y] = NON_ITEM;
 }
 
 void destroy_item_stack( int x, int y, int cause )
@@ -607,6 +608,7 @@ void destroy_item_stack( int x, int y, int cause )
             si->clear();
         }
     }
+    igrd[x][y] = NON_ITEM;
 }
 
 static bool _invisible_to_player( const item_def& item )