--- src/object1.c.orig	2007-10-20 14:45:45.000000000 -0400
+++ src/object1.c	2007-10-20 14:44:53.000000000 -0400
@@ -6425,6 +6425,25 @@
 	/* Try to grab ammo */
 	pickup_ammo();
 
+	/* Mega Hack -- If we have auto-ID, do an ID sweep *before*
+	 * squelching, so that we don't have to walk over things twice to
+	 * get them squelched.  --dsb */
+	if (p_ptr->auto_id)
+	{
+		for (this_o_idx = cave[p_ptr->py][p_ptr->px].o_idx; this_o_idx; this_o_idx = next_o_idx)
+		{
+			/* Acquire object */
+			o_ptr = &o_list[this_o_idx];
+
+			/* Acquire next object */
+			next_o_idx = o_ptr->next_o_idx;
+
+			/* Identify object */
+			object_aware(o_ptr);
+			object_known(o_ptr);
+		}
+	}
+
 	/* Squeltch the floor */
 	squeltch_grid();
 
@@ -6434,12 +6453,6 @@
 		/* Acquire object */
 		o_ptr = &o_list[this_o_idx];
 
-		if (p_ptr->auto_id)
-		{
-			object_aware(o_ptr);
-			object_known(o_ptr);
-		}
-
 		/* Acquire next object */
 		next_o_idx = o_ptr->next_o_idx;