--- deliantra/server/common/treasure.C	2007/07/01 05:00:18	1.64
+++ deliantra/server/common/treasure.C	2008/04/15 03:16:02	1.71
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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
+ * Deliantra 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.
@@ -18,7 +18,7 @@
  * 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>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 /* TREASURE_DEBUG does some checking on the treasurelists after loading.
@@ -141,7 +141,7 @@
 
   for (;;)
     {
-      coroapi::cede_to_tick_every (10);
+      coroapi::cede_to_tick ();
 
       switch (f.kw)
         {
@@ -245,7 +245,7 @@
 
       op->expand_tail ();
 
-      if (ob_blocked (op, creator->map, creator->x, creator->y))
+      if (op->blocked (creator->map, creator->x, creator->y))
         op->destroy ();
       else
         {
@@ -491,23 +491,18 @@
 int
 level_for_item (const object *op, int difficulty)
 {
-  int olevel = 0;
-
   if (!op->inv)
     {
       LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
       return 0;
     }
 
-  olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2));
+  int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
 
   if (olevel <= 0)
-    olevel = rndm (1, MIN (op->inv->level, 1));
-
-  if (olevel > MAXLEVEL)
-    olevel = MAXLEVEL;
+    olevel = rndm (1, op->inv->level);
 
-  return olevel;
+  return min (olevel, MAXLEVEL);
 }
 
 /*
@@ -1135,7 +1130,7 @@
 static artifactlist *
 get_empty_artifactlist (void)
 {
-  return salloc0 <artifactlist> ();
+  return salloc0<artifactlist> ();
 }
 
 /*
@@ -1144,7 +1139,7 @@
 static artifact *
 get_empty_artifact (void)
 {
-  return salloc0 <artifact> ();
+  return salloc0<artifact> ();
 }
 
 /*
@@ -1162,128 +1157,6 @@
 }
 
 /*
- * For debugging purposes.  Dumps all tables.
- */
-void
-dump_artifacts (void)
-{
-  artifactlist *al;
-  artifact *art;
-  linked_char *next;
-
-  fprintf (logfile, "\n");
-  for (al = first_artifactlist; al != NULL; al = al->next)
-    {
-      fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
-      for (art = al->items; art != NULL; art = art->next)
-        {
-          fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
-          if (art->allowed != NULL)
-            {
-              fprintf (logfile, "\tallowed combinations:");
-              for (next = art->allowed; next != NULL; next = next->next)
-                fprintf (logfile, "%s,", &next->name);
-              fprintf (logfile, "\n");
-            }
-        }
-    }
-  fprintf (logfile, "\n");
-}
-
-/*
- * For debugging purposes.  Dumps all treasures recursively (see below).
- */
-void
-dump_monster_treasure_rec (const char *name, treasure *t, int depth)
-{
-  treasurelist *tl;
-  int i;
-
-  if (depth > 100)
-    return;
-
-  while (t)
-    {
-      if (t->name)
-        {
-          for (i = 0; i < depth; i++)
-            fprintf (logfile, "  ");
-
-          fprintf (logfile, "{   (list: %s)\n", &t->name);
-
-          tl = treasurelist::find (t->name);
-          if (tl)
-            dump_monster_treasure_rec (name, tl->items, depth + 2);
-
-          for (i = 0; i < depth; i++)
-            fprintf (logfile, "  ");
-
-          fprintf (logfile, "}   (end of list: %s)\n", &t->name);
-        }
-      else
-        {
-          for (i = 0; i < depth; i++)
-            fprintf (logfile, "  ");
-
-          if (t->item && t->item->type == FLESH)
-            fprintf (logfile, "%s's %s\n", name, &t->item->object::name);
-          else
-            fprintf (logfile, "%s\n", &t->item->object::name);
-        }
-
-      if (t->next_yes)
-        {
-          for (i = 0; i < depth; i++)
-            fprintf (logfile, "  ");
-
-          fprintf (logfile, " (if yes)\n");
-          dump_monster_treasure_rec (name, t->next_yes, depth + 1);
-        }
-
-      if (t->next_no)
-        {
-          for (i = 0; i < depth; i++)
-            fprintf (logfile, "  ");
-
-          fprintf (logfile, " (if no)\n");
-          dump_monster_treasure_rec (name, t->next_no, depth + 1);
-        }
-
-      t = t->next;
-    }
-}
-
-/*
- * For debugging purposes.  Dumps all treasures for a given monster.
- * Created originally by Raphael Quinet for debugging the alchemy code.
- */
-void
-dump_monster_treasure (const char *name)
-{
-  archetype *at;
-  int found;
-
-  found = 0;
-  fprintf (logfile, "\n");
-
-  for_all_archetypes (at)
-    if (!strcasecmp (at->object::name, name) && at->title == NULL)
-      {
-        fprintf (logfile, "treasures for %s (arch: %s)\n", &at->object::name, &at->archname);
-        if (at->randomitems != NULL)
-          dump_monster_treasure_rec (at->object::name, at->randomitems->items, 1);
-        else
-          fprintf (logfile, "(nothing)\n");
-
-        fprintf (logfile, "\n");
-        found++;
-      }
-
-  if (found == 0)
-    fprintf (logfile, "No objects have the name %s!\n\n", name);
-}
-
-/*
  * Builds up the lists of artifacts from the file in the libdir.
  */
 void
@@ -1305,8 +1178,6 @@
   if (!f)
     return;
 
-  f.next ();
-
   for (;;)
     {
       switch (f.kw)