--- deliantra/server/include/material.h	2006/02/03 07:12:49	1.1
+++ deliantra/server/include/material.h	2006/12/15 20:07:02	1.6
@@ -1,9 +1,4 @@
 /*
- * static char *rcsid_material_h =
- *   "$Id$";
- */
-
-/*
     CrossFire, A Multiplayer game for X-windows
 
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -23,7 +18,7 @@
     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-devel@real-time.com
+    The authors can be reached via e-mail at crossfire.de
 */
 
 /* #defines are needed by living.h, so they must be loaded early */
@@ -46,27 +41,28 @@
 #define M_BONE			2048
 #define M_ICE			4096
 #define M_SPECIAL		8192	/* when displaying names, don't show the
-								   materialname */
+                                                                   materialname */
 
-typedef struct _materialtype {
-    const char	*name;
-	const char 	*description;
-    int		material;
-    sint8	save[NROFATTACKS];
-    sint8	mod[NROFATTACKS];
-    sint8	chance;
-    sint8	difficulty;
-    sint8	magic;
-    sint8	damage;
-    sint8	wc;
-    sint8	ac;
-	sint8	sp;
-    int		weight;
-    int		value;
-    struct _materialtype *next;
-} materialtype_t;
+struct materialtype_t : zero_initialised
+{
+  shstr name;
+  shstr description;
+  int	material;
+  sint8	save[NROFATTACKS];
+  sint8	mod[NROFATTACKS];
+  sint8	chance;
+  sint8	difficulty;
+  sint8	magic;
+  sint8	damage;
+  sint8	wc;
+  sint8	ac;
+  sint8	sp;
+  int	weight;
+  int	value;
+  struct materialtype_t *next;
+};
 
-EXTERN materialtype_t *materialt;
+extern materialtype_t *materialt;
 
 #endif	/* MATERIAL_H_1 */