Don't write garbage to unused trade destination in trade file

[empserver] / include / trade.h

diff --git a/include/trade.h b/include/trade.h
index 21f732384fa9af6083e7c196fd873f4adee1ecd2..b7ed5e37f4c27b12569a1b5b7aa7cda782e9c0c6 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-2004, 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
@@ -19,71 +19,53 @@
  *
  *  ---
  *
- *  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_
+#ifndef TRADE_H
+#define TRADE_H
 
-#include "genitem.h"
-#include "nuke.h"
-#include "plane.h"
-#include "land.h"
-#include "ship.h"
+#include <time.h>
+#include "types.h"
 
 struct trdstr {
-    short ef_type;
+    /* initial part must match struct empobj */
+    signed ef_type: 8;
+    unsigned trd_seqno: 12;
+    unsigned trd_generation: 12;
+    int trd_uid;
+    time_t trd_timestamp;
     natid trd_owner;
-    short trd_uid;
-    char trd_type;
-    short trd_unitid;
+    /* 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_x;               /* destination for teleporting trade */
     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;
-};
-
-extern int trade_check_ok(struct trdstr *, union trdgenstr *);
-extern s_char *trade_nameof(struct trdstr *, union trdgenstr *);
-extern int trade_desc(struct trdstr *, union trdgenstr *);
-extern int trade_getitem(struct trdstr *, union trdgenstr *);
-extern long get_couval(int);
+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, p)
-#define puttrade(n, p) \
-       ef_write(EF_TRADE, n, 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