--- deliantra/server/common/treasure.C	2007/04/19 19:24:25	1.52
+++ deliantra/server/common/treasure.C	2007/04/24 00:42:02	1.57
@@ -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
@@ -232,13 +232,22 @@
 static void
 put_treasure (object *op, object *creator, int flags)
 {
-  /* 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)
     {
+      /* 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
@@ -366,6 +375,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