--- deliantra/server/include/material.h 2006/09/03 00:18:41 1.4 +++ deliantra/server/include/material.h 2007/02/06 13:21:29 1.10 @@ -1,31 +1,27 @@ /* - * static char *rcsid_material_h = - * "$Id$"; + * CrossFire, A Multiplayer game for X-windows + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * 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@schmorp.de */ -/* - 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 @@ -52,7 +48,7 @@ { shstr name; shstr description; - int material; + int material; sint8 save[NROFATTACKS]; sint8 mod[NROFATTACKS]; sint8 chance; @@ -61,9 +57,10 @@ sint8 damage; sint8 wc; sint8 ac; - sint8 sp; - int weight; - int value; + sint8 sp; + int weight; + int value; + int density; // g/cm² * 1000 == kg/m³ struct materialtype_t *next; };