--- deliantra/server/common/item.C	2007/05/28 21:21:40	1.36
+++ deliantra/server/common/item.C	2007/07/01 05:00:17	1.38
@@ -1,23 +1,22 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * 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
  * 
- * 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.
+ * 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 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 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
@@ -773,7 +772,7 @@
 
 #ifdef NEW_MATERIAL_CODE
   if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt &&
-      op->arch->clone.materialname != mt->name && !(op->material & M_SPECIAL))
+      op->arch->materialname != mt->name && !(op->material & M_SPECIAL))
     {
       strcpy (buf, mt->description);
       len = strlen (buf);
@@ -936,7 +935,7 @@
       int first = 1;
 
       for (t = op->randomitems->items; t != NULL; t = t->next)
-        if (t->item && t->item->clone.type == SPELL)
+        if (t->item && t->item->type == SPELL)
           {
             if (first)
               {
@@ -944,7 +943,7 @@
                 strcat (retbuf, "(Spell abilities:)");
               }
             strcat (retbuf, "(");
-            strcat (retbuf, t->item->clone.name);
+            strcat (retbuf, t->item->object::name);
             strcat (retbuf, ")");
           }
     }
@@ -1522,8 +1521,8 @@
         op->title = op->inv->name;
       else if (op->arch)
         {
-          op->name = op->arch->clone.name;
-          op->name_pl = op->arch->clone.name_pl;
+          op->name = op->arch->object::name;
+          op->name_pl = op->arch->object::name_pl;
         }
     }