Update copyright notice

[empserver] / include / combat.h

diff --git a/include/combat.h b/include/combat.h
index 2c9590ca66ca6f022be85dd4bda89a3163ff979c..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-2000, 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,28 +14,28 @@
  *  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/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  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_
-#define _COMBAT_H_
+#ifndef COMBAT_H
+#define COMBAT_H
 
-#include "sect.h"
-#include "queue.h"
+#include "types.h"
+#include "ship.h"
 
 struct combat {
     int type;                  /* EF_BAD, EF_SECTOR, EF_SHIP, or EF_PLANE */
@@ -56,39 +56,40 @@ struct combat {
     struct dchrstr *sct_dcp;
     struct mchrstr *shp_mcp;
     struct lchrstr *lnd_lcp;
-    s_char shp_name[MAXSHPNAMLEN];
+    char shp_name[MAXSHPNAMLEN]; /* FIXME huh? pulls in ship.h */
     int relations_checked;
 };
 
 /* 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_calcodds(int, int);
 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 *);
 extern double sector_strength(struct sctstr *);
-extern int att_estimate_defense(int, struct combat *, struct emp_qelem *,
-                               struct combat *, int);
+extern int att_get_offense(int, struct combat *, struct emp_qelem *,
+                          struct combat *);
 extern int att_empty_attack(int, int, struct combat *);
 extern int att_get_defense(struct emp_qelem *, struct combat *,
                           struct emp_qelem *, int, int);
-extern int att_reacting_units(struct combat *, struct emp_qelem *, int,
-                             int *, int);
+extern double att_reacting_units(struct combat *, struct emp_qelem *, int,
+                                int *, int);
 extern int att_get_support(int, int, int, int, int, struct emp_qelem *,
                           struct combat *, struct emp_qelem *,
                           struct combat *, double *, double *, int);
@@ -97,6 +98,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