--- deliantra/server/common/treasure.C	2009/10/15 16:00:37	1.87
+++ deliantra/server/common/treasure.C	2009/11/10 16:29:20	1.94
@@ -53,6 +53,20 @@
 
 static tl_map_t tl_map;
 
+//TODO: class method
+static void free_treasurestruct (treasure *t); // bleh desu
+static void
+clear (treasurelist *tl)
+{
+  if (tl->items)
+    {
+      free_treasurestruct (tl->items);
+      tl->items = 0;
+    }
+
+  tl->total_chance = 0;
+}
+
 /*
  * Searches for the given treasurelist
  */
@@ -93,19 +107,6 @@
   return tl;
 }
 
-//TODO: class method
-void
-clear (treasurelist *tl)
-{
-  if (tl->items)
-    {
-      free_treasurestruct (tl->items);
-      tl->items = 0;
-    }
-
-  tl->total_chance = 0;
-}
-
 #ifdef TREASURE_DEBUG
 /* recursived checks the linked list.  Treasurelist is passed only
  * so that the treasure name can be printed out
@@ -497,7 +498,7 @@
  * elmex Wed Aug  9 17:44:59 CEST 2006:
  *        Removed multiplicator, too many high-level items were generated on low-difficulty maps.
  */
-int
+static int
 level_for_item (const object *op, int difficulty)
 {
   if (!op->inv)
@@ -524,7 +525,7 @@
  *       weird integer between 1-31.
  *
  */
-int
+static int
 magic_from_difficulty (int difficulty)
 {
   int percent = 0, magic = 0;
@@ -624,10 +625,9 @@
  *  other bonuses previously rolled and ones the item might natively have.
  * 2) Add code to deal with new PR method.
  */
-void
+static void
 set_ring_bonus (object *op, int bonus)
 {
-
   int r = rndm (bonus > 0 ? 25 : 11);
 
   if (op->type == AMULET)
@@ -760,7 +760,7 @@
  * rings and amulets.
  * Another scheme is used to calculate the magic of weapons and armours.
  */
-int
+static int
 get_magic (int diff)
 {
   int i;
@@ -775,6 +775,23 @@
   return 4;
 }
 
+/* special_potion() - so that old potion code is still done right. */
+static int
+special_potion (object *op)
+{
+  if (op->attacktype)
+    return 1;
+
+  if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
+    return 1;
+
+  for (int i = 0; i < NROFATTACKS; i++)
+    if (op->resist[i])
+      return 1;
+
+  return 0;
+}
+
 #define DICE2	(get_magic(2)==2?2:1)
 #define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
 
@@ -889,7 +906,7 @@
     }
 
   /* materialtype modifications.  Note we allow this on artifacts. */
-  set_materialname (op, difficulty, NULL);
+  select_material (op, difficulty);
 
   if (flags & GT_MINIMAL)
     {
@@ -1082,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;
@@ -1450,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;
@@ -1643,24 +1660,7 @@
     }
 }
 
-/* special_potion() - so that old potion code is still done right. */
-int
-special_potion (object *op)
-{
-  if (op->attacktype)
-    return 1;
-
-  if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
-    return 1;
-
-  for (int i = 0; i < NROFATTACKS; i++)
-    if (op->resist[i])
-      return 1;
-
-  return 0;
-}
-
-void
+static void
 free_treasurestruct (treasure *t)
 {
   if (t->next)     free_treasurestruct (t->next);
@@ -1670,7 +1670,7 @@
   delete t;
 }
 
-void
+static void
 free_charlinks (linked_char *lc)
 {
   if (lc->next)
@@ -1679,7 +1679,7 @@
   delete lc;
 }
 
-void
+static void
 free_artifact (artifact *at)
 {
   if (at->next)    free_artifact  (at->next);
@@ -1690,34 +1690,3 @@
   sfree (at);
 }
 
-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);
-    }
-}
-
-void
-free_all_treasures (void)
-{
-  treasurelist *tl, *next;
-
-  for (tl = first_treasurelist; tl; tl = next)
-    {
-      clear (tl);
-
-      next = tl->next;
-      delete tl;
-    }
-
-  free_artifactlist (first_artifactlist);
-}