Update copyright notice.

[empserver] / include / trade.h

diff --git a/include/trade.h b/include/trade.h
index 28be53fede04d89ec43111488b564f9e55d2a084..9cb3d8cc2ddd4da9bc5dbdd94ca3f1c95ce9d069 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-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -43,45 +43,48 @@
 #include "land.h"
 #include "ship.h"
 
-#include "prototype.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;
+    short ef_type;
+    natid trd_owner;
+    short trd_uid;
+    char trd_type;
+    short 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;
+    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;
+    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 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 long get_outstand(int);
+extern double loan_owed(struct lonstr *loan, time_t paytime);
 
 #define gettrade(n, p) \
-       ef_read(EF_TRADE, n, (caddr_t)p)
+       ef_read(EF_TRADE, n, p)
 #define puttrade(n, p) \
-       ef_write(EF_TRADE, n, (caddr_t)p)
+       ef_write(EF_TRADE, n, p)
 #define gettradep(n) \
        (struct trdstr *) ef_ptr(EF_TRADE, n)