--- deliantra/server/common/treasure.C	2009/05/05 04:51:56	1.85
+++ deliantra/server/common/treasure.C	2009/11/06 12:27:05	1.88
@@ -5,18 +5,19 @@
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * 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.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and 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 <support@deliantra.net>
  */
@@ -52,6 +53,21 @@
 
 static tl_map_t tl_map;
 
+//TODO: class method
+static void
+clear (treasurelist *tl)
+{
+  void free_treasurestruct (treasure *t);
+
+  if (tl->items)
+    {
+      free_treasurestruct (tl->items);
+      tl->items = 0;
+    }
+
+  tl->total_chance = 0;
+}
+
 /*
  * Searches for the given treasurelist
  */
@@ -92,19 +108,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
@@ -774,6 +777,23 @@
   return 4;
 }
 
+/* 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;
+}
+
 #define DICE2	(get_magic(2)==2?2:1)
 #define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
 
@@ -1024,19 +1044,20 @@
                 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
                 /* books w/ info are worth more! */
                 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
-                /* creator related stuff */
-
-                /* for library, chained books.  Note that some monsters have no_pick
-                 * set - we don't want to set no pick in that case.
-                 */
-                if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
-                  SET_FLAG (op, FLAG_NO_PICK);
-                if (creator->slaying && !op->slaying)   /* for check_inv floors */
-                  op->slaying = creator->slaying;
 
                 /* add exp so reading it gives xp (once) */
                 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
               }
+
+            /* creator related stuff */
+
+            /* for library, chained books.  Note that some monsters have no_pick
+              * set - we don't want to set no pick in that case.
+              */
+            if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
+              SET_FLAG (op, FLAG_NO_PICK);
+            if (creator->slaying && !op->slaying)   /* for check_inv floors */
+              op->slaying = creator->slaying;
             break;
 
           case SPELLBOOK:
@@ -1641,23 +1662,6 @@
     }
 }
 
-/* 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
 free_treasurestruct (treasure *t)
 {