Update copyright notice

[empserver] / include / loan.h

diff --git a/include/loan.h b/include/loan.h
index d417ac5edac12e51b346cc5dc9a1f48cb567b26b..86b7a982741af49b3087cf50be287db7c2d9b6b0 100644 (file)
--- a/include/loan.h
+++ b/include/loan.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, 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,31 +19,38 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  loan.h: Definitions for loans
- * 
+ *
  *  Known contributors to this file:
- *  
+ *
  */
 
 #ifndef LOAN_H
 #define LOAN_H
 
+#include <time.h>
+#include "types.h"
+
 #define        MAXLOAN         100000
 #define SECS_PER_DAY   (60*60*24)
 
 struct lonstr {
-    short ef_type;
+    /* initial part must match struct empobj */
+    signed ef_type: 8;
+    unsigned l_seqno: 12;
+    unsigned l_generation: 12;
+    int l_uid;
+    time_t l_timestamp;
+    /* end of part matching struct empobj */
     natid l_loner;             /* loan shark */
-    short l_uid;
     natid l_lonee;             /* sucker */
-    s_char l_status;           /* loan status */
-    short l_sell;              /* pointer to trade file (unused) */
+    signed char l_status;      /* loan status */
     int l_irate;               /* interest rate */
     int l_ldur;                        /* intended duration */
     long l_amtpaid;            /* amount paid so far */
@@ -56,14 +63,10 @@ struct lonstr {
 #define LS_PROPOSED    AGREE_PROPOSED
 #define LS_SIGNED      AGREE_SIGNED
 
-extern long get_outstand(int);
 extern double loan_owed(struct lonstr *loan, time_t paytime);
 
-#define getloan(n, lp) \
-       ef_read(EF_LOAN, n, lp)
-#define putloan(n, lp) \
-       ef_write(EF_LOAN, n, lp)
-#define getloanp(n) \
-       (struct lonstr *) ef_ptr(EF_LOAN, n)
+#define getloan(n, p) ef_read(EF_LOAN, (n), (p))
+#define putloan(n, p) ef_write(EF_LOAN, (n), (p))
+#define getloanp(n) ((struct lonstr *)ef_ptr(EF_LOAN, (n)))
 
 #endif