--- deliantra/server/common/treasure.C	2007/04/19 16:23:46	1.50
+++ deliantra/server/common/treasure.C	2007/05/12 18:14:47	1.60
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -199,8 +199,6 @@
    * Add up the chance total, and check to make sure the yes & no
    * fields of the treasures are not being used.
    */
-  tl->total_chance = 0;
-
   if (one)
     {
       for (treasure *t = tl->items; t; t = t->next)
@@ -232,17 +230,29 @@
 static void
 put_treasure (object *op, object *creator, int flags)
 {
-  object *tmp;
-
-  /* Bit of a hack - spells should never be put onto the map.  The entire
-   * treasure stuff is a problem - there is no clear idea of knowing
-   * this is the original object, or if this is an object that should be created
-   * by another object.
-   */
-  if (flags & GT_ENVIRONMENT && op->type != SPELL)
+  if (flags & GT_ENVIRONMENT)
     {
-      SET_FLAG (op, FLAG_OBJ_ORIGINAL);
-      op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
+      /* Bit of a hack - spells should never be put onto the map.  The entire
+       * treasure stuff is a problem - there is no clear idea of knowing
+       * this is the original object, or if this is an object that should be created
+       * by another object.
+       */
+      //TODO: flag such as objects... as such (no drop, anybody?)
+      if (op->type == SPELL)
+        {
+          op->destroy ();
+          return;
+        }
+
+      op->expand_tail ();
+
+      if (ob_blocked (op, creator->map, creator->x, creator->y))
+        op->destroy ();
+      else
+        {
+          SET_FLAG (op, FLAG_OBJ_ORIGINAL);
+          op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
+        }
     }
   else
     {
@@ -251,8 +261,9 @@
       if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
         monster_check_apply (creator, op);
 
-      if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
-        esrv_send_item (tmp, op);
+      if (flags & GT_UPDATE_INV)
+        if (object *tmp = creator->in_player ())
+          esrv_send_item (tmp, op);
     }
 }
 
@@ -362,6 +373,12 @@
     }
 }
 
+void
+object::create_treasure (treasurelist *tl, int flags)
+{
+  ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
+}
+
 /* This calls the appropriate treasure creation function.  tries is passed
  * to determine how many list transitions or attempts to create treasure
  * have been made.  It is really in place to prevent infinite loops with
@@ -382,6 +399,15 @@
       return;
     }
 
+  if (op->flag [FLAG_TREASURE_ENV])
+    {
+      // do not generate items when there already is something above the object
+      if (op->flag [FLAG_IS_FLOOR] && op->above)
+        return;
+
+      flag |= GT_ENVIRONMENT;
+    }
+
   if (tl->total_chance)
     create_one_treasure (tl, op, flag, difficulty, tries);
   else
@@ -624,7 +650,7 @@
         case 4:
         case 5:
         case 6:
-          set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));
+          op->stats.stat (r) += bonus;
           break;
 
         case 7:
@@ -1394,7 +1420,7 @@
     }
 
   for (i = 0; i < NUM_STATS; i++)
-    change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));
+    change_attr_value (&(op->stats), i, change->stats.stat (i));
 
   op->attacktype |= change->attacktype;
   op->path_attuned |= change->path_attuned;
@@ -1568,14 +1594,15 @@
 }
 
 static int
-legal_artifact_combination (object *op, artifact * art)
+legal_artifact_combination (object *op, artifact *art)
 {
   int neg, success = 0;
   linked_char *tmp;
   const char *name;
 
-  if (art->allowed == (linked_char *) NULL)
+  if (!art->allowed)
     return 1;                   /* Ie, "all" */
+
   for (tmp = art->allowed; tmp; tmp = tmp->next)
     {
 #ifdef TREASURE_VERBOSE
@@ -1596,6 +1623,7 @@
       else if (neg)
         success = 1;
     }
+
   return success;
 }