client: Unbreak standalone build

[empserver] / include / trade.h

diff --git a/include/trade.h b/include/trade.h
index 9beac75cb6014a0a1e76b8b363f68f102c176e97..7e5cd156fd2c340a4105177caa2221114e4da1e7 100644 (file)
--- a/include/trade.h
+++ b/include/trade.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,73 +14,57 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
- *  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 "file.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;
-    long trd_price;
+    /* end of part matching struct empobj */
+    short trd_type;
+    int trd_unitid;
+    int trd_price;
     int trd_maxbidder;
-    int trd_maxprice;
     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;
-};
-
-s_char *trade_nameof(struct trdstr * tp, union trdgenstr * tgp);
+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, (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