/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * 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.
*
* ---
*
* treaty.h: Definitions for treaties
- *
+ *
* Known contributors to this file:
* Steve McClure, 1998
- *
*/
-#ifndef _TREATY_H_
-#define _TREATY_H_
+#ifndef TREATY_H
+#define TREATY_H
+
+#include <time.h>
+#include "types.h"
struct trtstr {
+ /* 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 */
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 */
time_t trt_exp; /* expiration date */
};
-struct tchrstr {
- int t_cond; /* bit to indicate this clause */
- s_char *t_name; /* description of clause */
-};
-
-#define TS_FREE 0
-#define TS_PROPOSED 1
-#define TS_SIGNED 2
+#define TS_FREE AGREE_FREE
+#define TS_PROPOSED AGREE_PROPOSED
+#define TS_SIGNED AGREE_SIGNED
/* treaty clauses */
#define LNDATT bit(0) /* no attacks on land units */
#define TRTENL bit(9) /* no enlistment */
#define SUBFIR bit(10) /* no depth-charging submarines */
-/* global treaty variables */
-
-#define gettre(n, p) \
- ef_read(EF_TREATY, n, (caddr_t)p)
-#define puttre(n, p) \
- ef_write(EF_TREATY, n, (caddr_t)p)
-#define gettrep(n) \
- (struct trtstr *) ef_ptr(EF_TREATY, n)
-
-extern struct tchrstr tchr[];
-
-extern int trt_maxno;
+#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 /* _TREATY_H_ */
+#endif