Generation numbers to catch write back of stale copies

[empserver] / include / loan.h

diff --git a/include/loan.h b/include/loan.h
index 1051febfa17f010b3ad368539281c319a952da2e..fbfe1568760e765da799985e12a360fd016bf437 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-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,9 +26,9 @@
  *  ---
  *
  *  loan.h: Definitions for loans
- * 
+ *
  *  Known contributors to this file:
- *  
+ *
  */
 
 #ifndef LOAN_H
@@ -41,9 +41,14 @@
 #define SECS_PER_DAY   (60*60*24)
 
 struct lonstr {
+    /* initial part must match struct empobj */
     short ef_type;
-    natid l_loner;             /* loan shark */
     short l_uid;
+    unsigned l_seqno;
+    unsigned l_generation;
+    time_t l_timestamp;
+    /* end of part matching struct empobj */
+    natid l_loner;             /* loan shark */
     natid l_lonee;             /* sucker */
     signed char l_status;      /* loan status */
     short l_sell;              /* pointer to trade file (unused) */
@@ -63,6 +68,6 @@ extern double loan_owed(struct lonstr *loan, time_t paytime);
 
 #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))
+#define getloanp(n) ((struct lonstr *)ef_ptr(EF_LOAN, (n)))
 
 #endif