Generation numbers to catch write back of stale copies

[empserver] / include / empobj.h

diff --git a/include/empobj.h b/include/empobj.h
index 0fbeb0f75d0b6c2e0ebc73c673919a5e1f24e7bb..3906c13a639d280f3cb3185b737057b7aa065a77 100644 (file)
--- a/include/empobj.h
+++ b/include/empobj.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, 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,10 +26,10 @@
  *  ---
  *
  *  empobj.h: General empire objects.
- * 
+ *
  *  Known contributors to this file:
  *     Ron Koenderink, 2006
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2008
  */
 
 #ifndef EMPOBJ_H
@@ -57,6 +57,8 @@ struct empobj {
      */
     short ef_type;
     short uid;
+    unsigned seqno;
+    unsigned generation;
     time_t timestamp;
     /* end of part matching struct emptypedstr */
     natid own;         /* valid if EFF_OWNER is in table's flags */
@@ -67,7 +69,7 @@ struct empobj {
     signed char effic;
     signed char mobil;
     unsigned char off;
-    short tech;        
+    short tech;
     char group;                /* valid if EFF_GROUP is in table's flags */
     coord opx, opy;
     short mission;
@@ -82,7 +84,7 @@ union empobj_storage {
     struct lndstr land;
     struct lonstr loan;
     struct loststr lost;
-    struct natstr nat; 
+    struct natstr nat;
     struct nwsstr news;
     struct nukstr nuke;
     struct plnstr plane;