--- deliantra/server/common/map.C	2007/06/05 13:05:02	1.108
+++ deliantra/server/common/map.C	2007/06/07 19:12:22	1.109
@@ -716,6 +716,7 @@
 
           case KW_per_player: thawer.get (per_player); break;
           case KW_per_party:  thawer.get (per_party);  break;
+          case KW_no_reset:   thawer.get (no_reset);   break;
                               
           case KW_region:     default_region = region::find (thawer.get_str ()); break;
           case KW_shopitems:  shopitems = parse_shop_string (thawer.get_str ()); break;
@@ -802,6 +803,7 @@
   MAP_OUT (reset_time);
   MAP_OUT (reset_timeout);
   MAP_OUT (fixed_resettime);
+  MAP_OUT (no_reset);
   MAP_OUT (difficulty);
 
   if (default_region) MAP_OUT2 (region, default_region->name);
@@ -924,6 +926,74 @@
   clear ();
 }
 
+/* decay and destroy perishable items in a map */
+void
+maptile::do_decay_objects ()
+{
+  if (!spaces)
+    return;
+
+  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->materials;
+
+            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 ();
+      }
+}
+
 /*
  * Updates every button on the map (by calling update_button() for them).
  */