--- deliantra/server/include/treasure.h	2007/05/28 21:15:56	1.18
+++ deliantra/server/include/treasure.h	2008/05/06 16:55:26	1.24
@@ -1,25 +1,24 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * 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,2008 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 it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 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 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.
+ * 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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>
  */
 
 /*
@@ -51,8 +50,7 @@
   GT_STARTEQUIP  = 0x0004,
   GT_APPLY       = 0x0008,
   GT_ONLY_GOOD   = 0x0010,
-  GT_UPDATE_INV  = 0x0020,
-  GT_MINIMAL     = 0x0040,  // Do minimal adjustments
+  GT_MINIMAL     = 0x0020,  // Do minimal adjustments
 };
 
 /* when a treasure got cloned from archlist, we want perhaps change some default
@@ -79,22 +77,22 @@
 */
 struct treasure : zero_initialised
 {
-  struct archetype *item;	    /* Which item this link can be */
-  shstr name;			    /* If non null, name of list to use
-                                       instead */
-  treasure *next;	    /* Next treasure-item in a linked list */
-  treasure *next_yes;  /* If this item was generated, use */
-                                    /* this link instead of ->next */
-  treasure *next_no;   /* If this item was not generated, */
-                                    /* then continue here */
-  struct _change_arch change_arch;  /* override default arch values if set in treasure list */
-  uint16 chance;			    /* Percent chance for this item */
-                                    /* If the entry is a list transition,
-                                     * 'magic' contains the difficulty
-                                     * required to go to the new list
- 				     */
-  uint16 nrof;			    /* random 1 to nrof items are generated */
-  uint8 magic;			    /* Max magic bonus to item */
+  arch_ptr item;	 	   /* Which item this link can be */
+  shstr name;			   /* If non null, name of list to use
+                                      instead */
+  treasure *next;	    	   /* Next treasure-item in a linked list */
+  treasure *next_yes;  		   /* If this item was generated, use */
+                                   /* this link instead of ->next */
+  treasure *next_no;               /* If this item was not generated, */
+                                   /* then continue here */
+  struct _change_arch change_arch; /* override default arch values if set in treasure list */
+  uint16 chance;		   /* Percent chance for this item */
+                                   /* If the entry is a list transition,
+                                    * 'magic' contains the difficulty
+                                    * required to go to the new list
+ 				    */
+  uint16 nrof;			   /* random 1 to nrof items are generated */
+  uint8 magic;			   /* Max magic bonus to item */
 
   treasure ()
   : chance (100)
@@ -119,6 +117,12 @@
   static treasurelist *find (const char *name);
 };
 
+inline void
+object_freezer::put (keyword k, treasurelist *v)
+{
+  put (k, v ? &v->name : (const char *)0);
+}
+
 void create_treasure (treasurelist *t, object *op, int flag, int difficulty, int tries = 0);
 
 #endif