--- deliantra/server/include/attack.h 2006/09/16 22:06:17 1.8 +++ deliantra/server/include/attack.h 2010/10/11 18:40:43 1.22 @@ -1,25 +1,26 @@ /* - 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 -*/ + * This file is part of Deliantra, the Roguelike Realtime MMORPG. + * + * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992 Frank Tore Johansen + * + * Deliantra is free software: you can redistribute it and/or modify it under + * the terms of the Affero 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 Affero GNU General Public License + * and the GNU General Public License along with this program. If not, see + * . + * + * The authors can be reached via e-mail to + */ #ifndef ATTACK_H #define ATTACK_H @@ -65,23 +66,26 @@ EXTERN attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS]; -enum { +enum +{ # define def(uc, lc, name, plus, change) ATNR_ ## uc, # include "attackinc.h" # undef def NROFATTACKS }; -enum { +enum +{ # define def(uc, lc, name, plus, change) AT_ ## uc = 1UL << ATNR_ ## uc, # include "attackinc.h" # undef def }; -/* Short description of names of the attacktypes */ -extern const char* const attacktype_desc[NROFATTACKS]; +/* lowercase attacktype identifiers */ +extern const char* const attacktype_name[NROFATTACKS]; -extern const keyword resist_save[NROFATTACKS]; +/* short description of names of the attacktypes */ +extern const char* const attacktype_desc[NROFATTACKS]; /* Note that internal should not ever be referenced in the last two * tables. however, other resisttypes may be added, and if through some