--- deliantra/server/common/utils.C	2006/12/31 18:10:40	1.33
+++ deliantra/server/common/utils.C	2007/01/01 13:31:46	1.35
@@ -201,73 +201,68 @@
 void
 maptile::decay_objects ()
 {
-  int x, y, destroy;
-  object *op, *otmp;
+  if (!spaces)
+    return;
 
-  for (x = 0; x < width; x++)
-    for (y = 0; y < height; y++)
-      for (op = at (x, y).bot; op; op = otmp)
-        {
-          destroy = 0;
-          otmp = op->above;
-
-          if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
-            break;
-
-          if (QUERY_FLAG (op, FLAG_IS_FLOOR)
-              || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
-              || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
-              || QUERY_FLAG (op, FLAG_UNIQUE)
-              || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
-              || QUERY_FLAG (op, FLAG_UNPAID)
-              || op->is_alive ())
-            continue;
-
-          /* otherwise, we decay and destroy */
-          if (op->is_weapon ())
-            {
-              op->stats.dam--;
-              if (op->stats.dam < 0)
-                destroy = 1;
-            }
-          else if (op->is_armor ())
-            {
-              op->stats.ac--;
-              if (op->stats.ac < 0)
-                destroy = 1;
-            }
-          else if (op->type == FOOD)
-            {
-              op->stats.food -= rndm (5, 20);
-              if (op->stats.food < 0)
-                destroy = 1;
-            }
-          else
-            {
-              if (op->material & M_PAPER || op->material & M_LEATHER ||
-                  op->material & M_WOOD || op->material & M_ORGANIC || op->material & M_CLOTH || op->material & M_LIQUID)
-                destroy = 1;
-
-              if (op->material & M_IRON && rndm (1, 5) == 1)
-                destroy = 1;
-
-              if (op->material & M_GLASS && rndm (1, 2) == 1)
-                destroy = 1;
-
-              if ((op->material & M_STONE || op->material & M_ADAMANT) && rndm (1, 10) == 1)
-                destroy = 1;
-
-              if ((op->material & M_SOFT_METAL || op->material & M_BONE) && rndm (1, 3) == 1)
-                destroy = 1;
-
-              if (op->material & M_ICE && temp > 32)
-                destroy = 1;
-            }
-
-          /* adjust overall chance below */
-          if (destroy && rndm (0, 1))
-            op->destroy ();
-        }
+  for (mapspace *ms = spaces + size (); ms-- > spaces; )
+    for (object *above, *op = ms->bot; op; op = above)
+      {
+        above = op->above;
+
+        bool destroy = 0;
+
+        // do not decay anything above unique floor tiles (yet :)
+        if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
+          break;
+
+        if (QUERY_FLAG (op, FLAG_IS_FLOOR)
+            || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
+            || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
+            || QUERY_FLAG (op, FLAG_UNIQUE)
+            || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
+            || QUERY_FLAG (op, FLAG_UNPAID)
+            || op->is_alive ())
+          ; // do not decay
+        else if (op->is_weapon ())
+          {
+            op->stats.dam--;
+            if (op->stats.dam < 0)
+              destroy = 1;
+          }
+        else if (op->is_armor ())
+          {
+            op->stats.ac--;
+            if (op->stats.ac < 0)
+              destroy = 1;
+          }
+        else if (op->type == FOOD)
+          {
+            op->stats.food -= rndm (5, 20);
+            if (op->stats.food < 0)
+              destroy = 1;
+          }
+        else
+          {
+            int mat = op->material;
+
+            if (mat & M_PAPER
+                || mat & M_LEATHER
+                || mat & M_WOOD
+                || mat & M_ORGANIC
+                || mat & M_CLOTH
+                || mat & M_LIQUID
+                || (mat & M_IRON  && rndm (1, 5) == 1)
+                || (mat & M_GLASS && rndm (1, 2) == 1)
+                || ((mat & M_STONE      || mat & M_ADAMANT) && rndm (1, 10) == 1)
+                || ((mat & M_SOFT_METAL || mat & M_BONE)    && rndm (1, 3)  == 1)
+                || (mat & M_ICE && temp > 32))
+              destroy = 1;
+          }
+
+        /* adjust overall chance below */
+        if (destroy && rndm (0, 1))
+          op->destroy ();
+      }
 }
 
 /* convert materialname to materialtype_t */