Update known contributors comments

[empserver] / include / treaty.h

diff --git a/include/treaty.h b/include/treaty.h
index 8a0cadc839f516b3e5a957998aa9471365bf1ede..90d362e607052a4c7ac876a0eed2b3aa8a07fa96 100644 (file)
--- a/include/treaty.h
+++ b/include/treaty.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-2011, 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,9 +25,9 @@
  *  ---
  *
  *  treaty.h: Definitions for treaties
- * 
+ *
  *  Known contributors to this file:
- *      Steve McClure, 1998
+ *     Steve McClure, 1998
  */
 
 #ifndef TREATY_H
@@ -38,15 +37,19 @@
 #include "types.h"
 
 struct trtstr {
-    short ef_type;
+    /* initial part must match struct empobj */
+    signed ef_type: 8;
+    unsigned trt_seqno: 12;
+    unsigned trt_generation: 12;
+    int trt_uid;
+    time_t trt_timestamp;
+    /* end of part matching struct empobj */
     natid trt_cna;             /* proposer */
-    short trt_uid;
     natid trt_cnb;             /* acceptor */
     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) */
     time_t trt_exp;            /* expiration date */
 };
 
@@ -55,20 +58,20 @@ struct trtstr {
 #define TS_SIGNED      AGREE_SIGNED
 
        /* treaty clauses */
-#define        LNDATT  bit(0)          /* no attacks on land units */
-#define        SEAATT  bit(1)          /* no attacks on ships */
-#define        SEAFIR  bit(2)          /* no shelling ships */
-#define        LANATT  bit(3)          /* no attacks on sectors */
-#define        LANFIR  bit(4)          /* no shelling sectors */
-#define        NEWSHP  bit(5)          /* no new ships */
-#define        NEWNUK  bit(6)          /* no new nuclear weapons */
-#define        NEWPLN  bit(7)          /* no new planes */
-#define NEWLND  bit(8)         /* no new land units */
-#define        TRTENL  bit(9)          /* no enlistment */
-#define SUBFIR  bit(10)                /* no depth-charging submarines */
+#define LNDATT bit(0)          /* no attacks on land units */
+#define SEAATT bit(1)          /* no attacks on ships */
+#define SEAFIR bit(2)          /* no shelling ships */
+#define LANATT bit(3)          /* no attacks on sectors */
+#define LANFIR bit(4)          /* no shelling sectors */
+#define NEWSHP bit(5)          /* no new ships */
+#define NEWNUK bit(6)          /* no new nuclear weapons */
+#define NEWPLN bit(7)          /* no new planes */
+#define NEWLND bit(8)          /* no new land units */
+#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 gettrep(n) ((struct trtstr *)ef_ptr(EF_TREATY, (n)))
 
 #endif