Update copyright notice.

[empserver] / include / trade.h

diff --git a/include/trade.h b/include/trade.h
index 5739c5bf18e96948660cc45fd0b0ef11ba28ce78..f8cdca299acb2263346bc32e23a4cb9360970900 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-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -37,17 +37,14 @@
 #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;
     natid trd_owner;
     short trd_uid;
-    char trd_type;
+    short trd_type;
     short trd_unitid;
     long trd_price;
     int trd_maxbidder;
@@ -56,26 +53,14 @@ struct trdstr {
     coord trd_y;
 };
 
-union trdgenstr {
-    struct genitem gen;
-    struct nukstr nuk;
-    struct plnstr pln;
-    struct lndstr lnd;
-    struct shpstr shp;
-};
-
-extern int trade_check_ok(struct trdstr *, union trdgenstr *);
-extern int trade_check_item_ok(union trdgenstr *);
-extern 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