Store sequence numbers more compactly

[empserver] / include / trade.h

diff --git a/include/trade.h b/include/trade.h
index 28be53fede04d89ec43111488b564f9e55d2a084..72ebdbbb90b3d9261850fc1b4af76cb4f15c29b0 100644 (file)
--- a/include/trade.h
+++ b/include/trade.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, 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
@@ -19,70 +19,52 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  trade.h: Definitions for trading units/ships/planes in a time delay
  *           system
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare
  *     Pat Loney, 1992
  *     Steve McClure, 1996
  */
 
-#ifndef _TRADE_H_
-#define _TRADE_H_
-
-#include "genitem.h"
-#include "nuke.h"
-#include "plane.h"
-#include "land.h"
-#include "ship.h"
+#ifndef TRADE_H
+#define TRADE_H
 
-#include "prototype.h"
+#include <time.h>
+#include "types.h"
 
 struct trdstr {
-        short   ef_type;
-       natid   trd_owner;
-       short   trd_uid;
-       char    trd_type;
-       short   trd_unitid;
-       long    trd_price;
-       int     trd_maxbidder;
-       int     trd_maxprice;
-       time_t  trd_markettime;
-       coord   trd_x;
-       coord   trd_y;
+    /* initial part must match struct empobj */
+    signed ef_type: 8;
+    unsigned trd_seqno: 12;
+    int trd_uid;
+    time_t trd_timestamp;
+    natid trd_owner;
+    /* end of part matching struct empobj */
+    short trd_type;
+    int trd_unitid;
+    long trd_price;
+    int trd_maxbidder;
+    time_t trd_markettime;
+    coord trd_x;
+    coord trd_y;
 };
 
-struct genstr {
-        short   trg_ef_type;
-       natid   trg_own;
-       short   trg_uid;
-       coord   trg_x;
-       coord   trg_y;
-       s_char  trg_type;
-};
-
-union trdgenstr {
-        struct  genstr gen;
-        struct  nukstr nuk;
-        struct  plnstr pln;
-        struct  lndstr lnd;
-        struct  shpstr shp;
-};
- 
-s_char *trade_nameof _PROTO((struct trdstr *tp, union trdgenstr *tgp));
+extern int trade_check_ok(struct trdstr *, union empobj_storage *);
+extern int trade_check_item_ok(union empobj_storage *);
+extern char *trade_nameof(struct trdstr *, union empobj_storage *);
+extern int trade_desc(struct trdstr *, union empobj_storage *);
+extern int trade_getitem(struct trdstr *, union empobj_storage *);
 
-#define gettrade(n, p) \
-       ef_read(EF_TRADE, n, (caddr_t)p)
-#define puttrade(n, p) \
-       ef_write(EF_TRADE, n, (caddr_t)p)
-#define gettradep(n) \
-       (struct trdstr *) ef_ptr(EF_TRADE, n)
+#define gettrade(n, p) ef_read(EF_TRADE, (n), (p))
+#define puttrade(n, p) ef_write(EF_TRADE, (n), (p))
+#define gettradep(n) ((struct trdstr *)ef_ptr(EF_TRADE, (n)))
 
-#endif /* _TRADE_H_ */
+#endif