--- deliantra/server/common/map.C	2007/05/17 23:35:19	1.103
+++ deliantra/server/common/map.C	2007/06/07 19:12:22	1.109
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Crossfire TRT is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
  * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 #include <unistd.h>
@@ -278,9 +278,9 @@
       return m1->at (sx, sy).move_block;
     }
 
-  for (tmp = ob->arch; tmp; tmp = tmp->more)
+  for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more)
     {
-      flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
+      flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
 
       if (flag & P_OUT_OF_MAP)
         return P_OUT_OF_MAP;
@@ -672,9 +672,9 @@
 {
   for (;;)
     {
-      keyword kw = thawer.get_kv ();
+      thawer.next ();
 
-      switch (kw)
+      switch (thawer.kw)
         {
           case KW_msg:
             thawer.get_ml (KW_endmsg, msg);
@@ -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);
@@ -871,8 +873,9 @@
   if (spaces)
     {
       for (mapspace *ms = spaces + size (); ms-- > spaces; )
-        while (object *op = ms->bot->head_ ())
+        while (object *op = ms->bot)
           {
+            op = op->head_ ();
             op->destroy_inv (false);
             op->destroy ();
           }
@@ -923,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).
  */
@@ -978,7 +1049,7 @@
             total_exp += op->stats.exp;
 
             if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
-              total_exp += at->clone.stats.exp * 8;
+              total_exp += at->stats.exp * 8;
 
             monster_cnt++;
           }