--- deliantra/server/common/utils.C	2007/05/17 21:32:08	1.56
+++ deliantra/server/common/utils.C	2007/07/01 05:00:18	1.60
@@ -1,25 +1,24 @@
 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002 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 (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 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
+ * 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>
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 /*
@@ -206,74 +205,6 @@
   return total;
 }
 
-/* decay and destroy perishable items in a map */
-void
-maptile::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 ();
-      }
-}
-
 /* convert materialname to materialtype_t */
 
 materialtype_t *
@@ -308,7 +239,7 @@
   mt = name_to_material (op->materialname);
   if (!mt)
     {
-      LOG (llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->name, &op->name, &op->materialname);
+      LOG (llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->archname, &op->name, &op->materialname);
       return;
     }