--- deliantra/server/include/treasure.h 2007/04/24 00:42:02 1.16
+++ deliantra/server/include/treasure.h 2008/05/06 16:55:26 1.24
@@ -1,25 +1,24 @@
/*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * 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
*
- * This program is free software; you can redistribute it and/or modify
+ * 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 2 of the License, or
+ * 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
+ * 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The authors can be reached via e-mail at crossfire@schmorp.de
+ * along with this program. If not, see .
+ *
+ * The authors can be reached via e-mail to
*/
/*
@@ -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 */
- uint8 chance; /* Percent chance for this item */
- uint8 magic; /* Max magic bonus to 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 */
+ 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