X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=include%2Funit.h;h=e1416dc3c2151b1101103b298115f948b9b1770d;hp=2f6b94abf5b862ed711125ebde37f66be126a15a;hb=HEAD;hpb=1118f1c0ca13ca25b662fa600c5101ff1d38b67d diff --git a/include/unit.h b/include/unit.h index 2f6b94abf..e1416dc3c 100644 --- a/include/unit.h +++ b/include/unit.h @@ -1,6 +1,6 @@ /* * Empire - A multi-player, client/server Internet based war game. - * Copyright (C) 1986-2012, Dave Pare, Jeff Bailey, Thomas Ruschak, + * Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak, * Ken Stevens, Steve McClure, Markus Armbruster * * Empire is free software: you can redistribute it and/or modify @@ -28,7 +28,7 @@ * * Known contributors to this file: * Ron Koenderink, 2006-2007 - * Markus Armbruster, 2006-2011 + * Markus Armbruster, 2006-2015 */ #ifndef UNIT_H @@ -38,12 +38,13 @@ 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_cargo_init(void); @@ -55,10 +56,9 @@ extern int unit_nplane(int, int, int *, int *, int *); extern void unit_onresize(int); extern char *unit_nameof(struct empobj *); -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 *, size_t); -extern void unit_view(struct emp_qelem *); +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);