X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=include%2Funit.h;h=e1416dc3c2151b1101103b298115f948b9b1770d;hp=7f21b9a6c7949409c80911658c32e1ef3da8aece;hb=HEAD;hpb=aee2bc78e2b2b771d673950d2be0f4877c8d348d

diff --git a/include/unit.h b/include/unit.h
index 7f21b9a6c..e1416dc3c 100644
--- a/include/unit.h
+++ b/include/unit.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, 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,22 +25,43 @@
  *  ---
  *
  *  unit.h: Generalize unit data structures and functions.
- * 
+ *
  *  Known contributors to this file:
  *     Ron Koenderink, 2006-2007
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2015
  */
- 
+
+#ifndef UNIT_H
+#define UNIT_H
+
+#include "empobj.h"
+
 struct ulist {
     struct emp_qelem queue;	/* list of units */
-    double mobil;		/* how much mobility the unit has left */
-    struct empobj_chr *chrp;	/* pointer to characteristics unit */
+    double mobil;		/* moving: how much the unit has left
+				   ground combat: how much to charge */
     union empobj_storage unit;	/* unit */
-    coord x, y;			/* x,y it came from LAND only */
-    int eff;			/* LAND only */
-    int supplied;		/* LAND only */
+    /* Rest used only by ground combat (attsub.c) */
+    coord x, y;			/* x,y it came from */
+    int eff;			/* initial efficiency */
+    int supplied;
 };
 
-extern void unit_list(struct emp_qelem *);
-extern void unit_put(struct emp_qelem *list, natid actor);
-extern char *unit_path(int, struct empobj *, char *);
+extern void unit_cargo_init(void);
+extern void unit_carrier_change(struct empobj *, int, int, int);
+extern int unit_cargo_first(int, int, int);
+extern int unit_cargo_next(int, int);
+extern int unit_cargo_count(int, int, int);
+extern int unit_nplane(int, int, int *, int *, int *);
+extern void unit_onresize(int);
+
+extern char *unit_nameof(struct empobj *);
+extern void unit_rad_map_set(struct emp_qelem *);
+extern int unit_move(struct emp_qelem *);
+extern void unit_teleport(struct empobj *, coord, coord);
+extern int unit_update_cargo(struct empobj *);
+extern void unit_drop_cargo(struct empobj *, natid);
+extern void unit_give_away(struct empobj *, natid, natid);
+extern void unit_wipe_orders(struct empobj *);
+
+#endif