--- deliantra/server/include/attack.h	2006/09/07 13:34:57	1.6
+++ deliantra/server/include/attack.h	2006/12/15 20:07:02	1.10
@@ -18,10 +18,9 @@
     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
 */
 
-
 #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