Fix generation numbers for autonav

[empserver] / include / nuke.h

diff --git a/include/nuke.h b/include/nuke.h
index a64cedaeacdc0a83a2e4203125e66ae6b3e6829c..bb1efd53349ffe6afed7e3d2ca20b59d1a04d734 100644 (file)
--- a/include/nuke.h
+++ b/include/nuke.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 @@
  *  ---
  *
  *  nuke.h: Definitions for things having to do with nukes
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  */
@@ -34,14 +34,20 @@
 #ifndef NUKE_H
 #define NUKE_H
 
+#include <time.h>
+#include "types.h"
+
 #define        N_MAXNUKE       20
 #define        MIN_DRNUKE_CONST        0.001
 
 struct nukstr {
     /* initial part must match struct empobj */
     short ef_type;
-    natid nuk_own;
     short nuk_uid;
+    unsigned nuk_seqno;
+    unsigned nuk_generation;
+    time_t nuk_timestamp;      /* Last time this nuke was touched */
+    natid nuk_own;
     coord nuk_x, nuk_y;                /* current loc of device */
     signed char nuk_type;      /* index in nchr[] */
     signed char nuk_effic;     /* unused, always 100% */
@@ -56,7 +62,6 @@ struct nukstr {
     short nuk_ship;            /* currently aboard ship (unused) */
     short nuk_plane;           /* currently aboard plane */
     short nuk_land;            /* currently aboard land (unused) */
-    time_t nuk_timestamp;      /* Last time this nuke was touched */
 };
 
 struct nchrstr {
@@ -78,7 +83,7 @@ struct nchrstr {
 
 #define getnuke(n, p) ef_read(EF_NUKE, (n), (p))
 #define putnuke(n, p) ef_write(EF_NUKE, (n), (p))
-#define getnukep(n) (struct nukstr *)ef_ptr(EF_NUKE, (n))
+#define getnukep(n) ((struct nukstr *)ef_ptr(EF_NUKE, (n)))
 
 /* Work required for building */
 #define NUK_BLD_WORK(lcm, hcm, oil, rad) \
@@ -86,4 +91,8 @@ struct nchrstr {
 
 extern struct nchrstr nchr[N_MAXNUKE + 1];
 
+/* src/lib/common/cargo.c */
+extern void nuk_carrier_change(struct nukstr *, int, int, int);
+extern int nuk_on_plane(struct plnstr *);
+
 #endif