COPYING duplicates information from README. Remove. Move GPL from

[empserver] / include / combat.h

diff --git a/include/combat.h b/include/combat.h
index 078917afe3defe6e127ec1595de3cb1833aba3f5..4b9c0c425ea5a4c70ed9128878c2b2b9db718918 100644 (file)
--- a/include/combat.h
+++ b/include/combat.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -31,8 +31,8 @@
  *     Ken Stevens, 1995
  */
 
-#ifndef _COMBAT_H_
-#define _COMBAT_H_
+#ifndef COMBAT_H
+#define COMBAT_H
 
 #include "sect.h"
 #include "queue.h"
@@ -97,6 +97,6 @@ extern int att_fight(int, struct combat *, struct emp_qelem *, double,
 extern int att_free_lists(struct emp_qelem *, struct emp_qelem *);
 
 
-extern s_char *att_mode[];
+extern char *att_mode[A_LBOARD + 1];
 
-#endif /* _COMBAT_H_ */
+#endif