--- deliantra/server/include/attack.h	2006/09/07 13:34:57	1.6
+++ deliantra/server/include/attack.h	2007/07/01 05:00:18	1.15
@@ -1,26 +1,25 @@
 /*
-    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 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 <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ */
 
 #ifndef ATTACK_H
 #define ATTACK_H
@@ -67,14 +66,14 @@
 EXTERN attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
 
 enum {
-# define def(uc, name, lc, plus, change) ATNR_ ## uc,
+# define def(uc, lc, name, plus, change) ATNR_ ## uc,
 #  include "attackinc.h"
 # undef def
   NROFATTACKS
 };
 
 enum {
-# define def(uc, name, lc, plus, change) AT_ ## uc = 1UL << ATNR_ ## uc,
+# define def(uc, lc, name, plus, change) AT_ ## uc = 1UL << ATNR_ ## uc,
 #  include "attackinc.h"
 # undef def
 };
@@ -82,8 +81,6 @@
 /* Short description of names of the attacktypes */
 extern const char* const attacktype_desc[NROFATTACKS];
 
-extern const keyword resist_save[NROFATTACKS];
-
 /* Note that internal should not ever be referenced in the last two
  * tables.  however, other resisttypes may be added, and if through some
  * bug these do get used somehow, might as well make it more easier to notice