Fix generation numbers for autonav

[empserver] / include / combat.h

diff --git a/include/combat.h b/include/combat.h
index 594505f82c6f05fdaf786d0d32df6ff8bbb10b42..0e53263d62c5fec69407674bc00b1560c5e1d6a5 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-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
  *  ---
  *
  *  combat.h: Definitions for things having to do with combat
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  */
@@ -34,8 +34,8 @@
 #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,7 +56,7 @@ struct combat {
     struct dchrstr *sct_dcp;
     struct mchrstr *shp_mcp;
     struct lchrstr *lnd_lcp;
-    char shp_name[MAXSHPNAMLEN];
+    char shp_name[MAXSHPNAMLEN]; /* FIXME huh? pulls in ship.h */
     int relations_checked;
 };
 
@@ -81,13 +81,13 @@ 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);