X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=include%2Ftrade.h;h=7e5cd156fd2c340a4105177caa2221114e4da1e7;hp=d34f71ba31bb6cfdec8aeafb658776ceb69f7874;hb=HEAD;hpb=1118f1c0ca13ca25b662fa600c5101ff1d38b67d

diff --git a/include/trade.h b/include/trade.h
index d34f71ba3..7e5cd156f 100644
--- 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-2012, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -36,7 +36,7 @@
 #ifndef TRADE_H
 #define TRADE_H
 
-#include <time.h>
+#include "file.h"
 #include "types.h"
 
 struct trdstr {
@@ -50,17 +50,17 @@ struct trdstr {
     /* end of part matching struct empobj */
     short trd_type;
     int trd_unitid;
-    long trd_price;
+    int trd_price;
     int trd_maxbidder;
     time_t trd_markettime;
     coord trd_x;		/* destination for teleporting trade */
     coord trd_y;
 };
 
-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_check_ok(struct trdstr *, struct empobj *);
+extern char *trade_nameof(struct trdstr *, struct empobj *);
+extern int trade_desc(struct empobj *);
+extern int trade_has_unsalable_cargo(struct empobj *, int);
 extern int trade_getitem(struct trdstr *, union empobj_storage *);
 
 #define gettrade(n, p) ef_read(EF_TRADE, (n), (p))