--- deliantra/server/common/treasure.C	2009/11/06 13:31:47	1.90
+++ deliantra/server/common/treasure.C	2009/11/10 16:29:20	1.94
@@ -906,7 +906,7 @@
     }
 
   /* materialtype modifications.  Note we allow this on artifacts. */
-  set_materialname (op, difficulty, NULL);
+  select_material (op, difficulty);
 
   if (flags & GT_MINIMAL)
     {
@@ -1099,9 +1099,9 @@
             op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
             /* maxhp is used to denote how many 'charges' the rod holds before */
             if (op->stats.maxhp)
-              op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace);
+              op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
             else
-              op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace);
+              op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
 
             op->stats.hp = op->stats.maxhp;
             break;
@@ -1467,8 +1467,8 @@
   if (change->materials)
     op->materials = change->materials;
 
-  if (change->materialname)
-    op->materialname = change->materialname;
+  if (change->material != MATERIAL_NULL)
+    op->material = change->material;
 
   if (change->slaying)
     op->slaying = change->slaying;
@@ -1690,19 +1690,3 @@
   sfree (at);
 }
 
-static void
-free_artifactlist (artifactlist *al)
-{
-  artifactlist *nextal;
-
-  for (al = first_artifactlist; al; al = nextal)
-    {
-      nextal = al->next;
-
-      if (al->items)
-        free_artifact (al->items);
-
-      sfree (al);
-    }
-}
-