--- deliantra/server/include/material.h 2006/02/03 07:12:49 1.1
+++ deliantra/server/include/material.h 2007/07/01 05:00:18 1.13
@@ -1,31 +1,26 @@
/*
- * static char *rcsid_material_h =
- * "$Id$";
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ *
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 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 .
+ *
+ * The authors can be reached via e-mail to
*/
-/*
- CrossFire, A Multiplayer game for X-windows
-
- Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- Copyright (C) 1992 Frank Tore Johansen
-
- This program 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.
-
- 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, 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
-*/
-
/* #defines are needed by living.h, so they must be loaded early */
#ifndef MATERIAL_H_1
#define MATERIAL_H_1
@@ -46,27 +41,29 @@
#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
+{
+ struct materialtype_t *next;
+ 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;
+ int density; // g/cm³ * 1000 == kg/m³
+};
-EXTERN materialtype_t *materialt;
+extern materialtype_t *materialt;
#endif /* MATERIAL_H_1 */