--- deliantra/server/common/treasure.C	2007/04/17 18:59:05	1.49
+++ deliantra/server/common/treasure.C	2007/04/19 16:23:46	1.50
@@ -147,8 +147,7 @@
       switch (f.kw)
         {
           case KW_arch:
-            if (!(t->item = archetype::find (f.get_str ())))
-              LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ());
+            t->item = archetype::get (f.get_str ());
             break;
 
           case KW_list:           f.get (t->name);                break;
@@ -399,13 +398,13 @@
 {
   difficulty = clamp (difficulty, 1, settings.max_level);
 
-  object *ob = object::create (), *tmp;
+  object *ob = object::create ();
 
   create_treasure (tl, ob, 0, difficulty, 0);
 
   /* Don't want to free the object we are about to return */
-  tmp = ob->inv;
-  if (tmp != NULL)
+  object *tmp = ob->inv;
+  if (tmp)
     tmp->remove ();
 
   if (ob->inv)
@@ -423,7 +422,6 @@
  */
 
 static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
-
 //    chance of magic        difficulty
 // +0  +1  +2  +3   +4
   {95,  2,  2,  1,   0}, //  1
@@ -459,14 +457,12 @@
   { 0,  0,  0,  0, 100}, // 31
 };
 
-
 /* calculate the appropriate level for wands staves and scrolls.  
  * This code presumes that op has had its spell object created (in op->inv)
  *
  * elmex Wed Aug  9 17:44:59 CEST 2006:
  *        Removed multiplicator, too many high-level items were generated on low-difficulty maps.
  */
-
 int
 level_for_item (const object *op, int difficulty)
 {
@@ -786,10 +782,7 @@
 
   if (op->randomitems && op->type != SPELL)
     {
-      create_treasure (op->randomitems, op, flags, difficulty, 0);
-      if (!op->inv)
-        LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
-
+      create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
       /* So the treasure doesn't get created again */
       op->randomitems = 0;
     }