--- deliantra/server/include/treasure.h	2006/09/16 22:06:17	1.6
+++ deliantra/server/include/treasure.h	2006/09/16 22:24:12	1.7
@@ -78,15 +78,15 @@
  * is generated (from a generator)
 */
 
-typedef struct treasurestruct : zero_initialised
+struct treasure : zero_initialised
 {
   struct archetype *item;		    /* Which item this link can be */
   shstr name;			    /* If non null, name of list to use
                                        instead */
-  struct treasurestruct *next;	    /* Next treasure-item in a linked list */
-  struct treasurestruct *next_yes;  /* If this item was generated, use */
+  treasure *next;	    /* Next treasure-item in a linked list */
+  treasure *next_yes;  /* If this item was generated, use */
                                     /* this link instead of ->next */
-  struct treasurestruct *next_no;   /* If this item was not generated, */
+  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 */
@@ -96,10 +96,9 @@
                                      * required to go to the new list
  				     */
   uint16 nrof;			    /* random 1 to nrof items are generated */
-} treasure;
+};
 
-
-typedef struct treasureliststruct : zero_initialised
+struct treasurelist : zero_initialised
 {
   shstr name;				/* Usually monster-name/combination */
   sint16 total_chance;			/* If non-zero, only 1 item on this
@@ -107,8 +106,8 @@
                                          * total_chance contains the sum of
                                          * the chance for this list.
                                          */
-  struct treasureliststruct *next;	/* Next treasure-item in linked list */
-  struct treasurestruct *items;		/* Items in this list, linked */
-} treasurelist;
+  treasurelist *next;	/* Next treasure-item in linked list */
+  treasure *items;		/* Items in this list, linked */
+};
 
 #endif