Update copyright notice

[empserver] / include / combat.h

diff --git a/include/combat.h b/include/combat.h
index 62bf34e2e9e7819cd93674fa8e5bcc584ff5e251..99e08d0fcdd50de50081b767a9da89edffff09fc 100644 (file)
--- a/include/combat.h
+++ b/include/combat.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire 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
+ *  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,
@@ -14,8 +14,7 @@
  *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,9 +25,10 @@
  *  ---
  *
  *  combat.h: Definitions for things having to do with combat
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
+ *     Markus Armbruster, 2005-2016
  */
 
 #ifndef COMBAT_H
@@ -61,22 +61,24 @@ struct combat {
 };
 
 /* Types of combat for use by attack routines */
-#define A_DEFEND        0
-#define        A_ATTACK        1
-#define        A_ASSAULT       2
-#define        A_PARA          3
+#define A_DEFEND       0
+#define A_ATTACK       1
+#define A_ASSAULT      2
+#define A_PARA         3
 #define A_BOARD                4
-#define A_LBOARD        5
+#define A_LBOARD       5
 
 /* src/lib/subs/attsub.c */
 extern double att_combat_eff(struct combat *);
+extern void att_move_land(int, struct combat *, struct emp_qelem *,
+                         struct combat *);
 extern void att_move_in_off(int, struct combat *, struct emp_qelem *,
                            struct combat *);
 extern int att_combat_init(struct combat *, int);
 extern int att_get_combat(struct combat *, int);
 extern int att_abort(int, struct combat *, struct combat *);
 extern int att_approach(struct combat *, struct combat *);
-extern int att_show(struct combat *);
+extern void att_show(struct combat *);
 extern int att_ask_support(int, int *, int *, int *, int *);
 extern int att_ask_offense(int, struct combat *, struct combat *,
                           struct emp_qelem *, int *, int *);