Make: Get SHELL from Autoconf

[empserver] / include / lost.h

diff --git a/include/lost.h b/include/lost.h
index e0a53270bdce652fd89493a2d3abd84ea29e3810..3c481c15a37fea5fe3e98359e6379014aea7e149 100644 (file)
--- a/include/lost.h
+++ b/include/lost.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,42 +14,50 @@
  *  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.
  *
  *  ---
  *
  *  lost.h: Definitions for lost items
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1997
  */
 
-#ifndef _LOST_H_
-#define _LOST_H_
+#ifndef LOST_H
+#define LOST_H
+
+#include "file.h"
+#include "types.h"
+
 struct loststr {
-    short   ef_type;
-    natid   lost_owner; /* Who lost it */
-    int     lost_uid;   /* This lost # */
-    char    lost_type;  /* Type of thing (ship, plane, nuke, land, sector) */
-    short   lost_id;    /* ID of thing */
-    coord   lost_x;
-    coord   lost_y;
-    time_t  lost_timestamp; /* When it was lost */
+    /* initial part must match struct empobj */
+    signed ef_type: 8;
+    unsigned lost_seqno: 12;
+    unsigned lost_generation: 12;
+    int lost_uid;
+    time_t lost_timestamp;     /* When it was lost */
+    natid lost_owner;          /* Who lost it */
+    /* end of part matching struct empobj */
+    short lost_type;           /* Type of thing (ship, plane, nuke, land, sector) */
+    int lost_id;               /* UID of lost thing (0 for sector) */
+    coord lost_x;
+    coord lost_y;
 };
 
-#define getlost(n, p) ef_read(EF_LOST, n, (caddr_t)p)
-#define putlost(n, p) ef_write(EF_LOST, n, (caddr_t)p)
+#define getlost(n, p) ef_read(EF_LOST, (n), (p))
+#define putlost(n, p) ef_write(EF_LOST, (n), (p))
 
 /* src/lib/subs/lostsub.c */
-extern int findlost(char  , natid  , short  , coord  , coord  , int );
-extern void makelost(char  , natid  , short  , coord  , coord );
-extern void makenotlost(char  , natid  , short  , coord  , coord );
-#endif /* _LOST_H_ */
+extern void lost_and_found(int, natid, natid, int, coord, coord);
+extern void makelost(int, natid, int, coord, coord);
+extern void makenotlost(int, natid, int, coord, coord);
+extern void delete_old_lostitems(void);
 
+#endif