Fix generation numbers for autonav

[empserver] / include / treaty.h

diff --git a/include/treaty.h b/include/treaty.h
index da5be58e2e985ee06cea4587b62aea80f68424f9..e70c2f98678b49730bc6ab78a3e01a02e713bcdf 100644 (file)
--- a/include/treaty.h
+++ b/include/treaty.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 @@
  *  ---
  *
  *  treaty.h: Definitions for treaties
- * 
+ *
  *  Known contributors to this file:
  *      Steve McClure, 1998
  */
@@ -34,13 +34,21 @@
 #ifndef TREATY_H
 #define TREATY_H
 
+#include <time.h>
+#include "types.h"
+
 struct trtstr {
+    /* initial part must match struct empobj */
     short ef_type;
-    natid trt_cna;             /* proposer */
     short trt_uid;
+    unsigned trt_seqno;
+    unsigned trt_generation;
+    time_t trt_timestamp;
+    /* end of part matching struct empobj */
+    natid trt_cna;             /* proposer */
     natid trt_cnb;             /* acceptor */
-    s_char trt_status;         /* treaty status */
-    s_char trt_fill;
+    signed char trt_status;    /* treaty status */
+    char trt_fill;
     short trt_acond;           /* conditions for proposer */
     short trt_bcond;           /* conditions for accepter */
     float trt_bond;            /* amount of bond involved (unused) */
@@ -64,11 +72,8 @@ struct trtstr {
 #define        TRTENL  bit(9)          /* no enlistment */
 #define SUBFIR  bit(10)                /* no depth-charging submarines */
 
-#define gettre(n, p) \
-       ef_read(EF_TREATY, n, p)
-#define puttre(n, p) \
-       ef_write(EF_TREATY, n, p)
-#define gettrep(n) \
-       (struct trtstr *) ef_ptr(EF_TREATY, n)
+#define gettre(n, p) ef_read(EF_TREATY, (n), (p))
+#define puttre(n, p) ef_write(EF_TREATY, (n), (p))
+#define gettrep(n) ((struct trtstr *)ef_ptr(EF_TREATY, (n)))
 
 #endif