Update copyright notice

[empserver] / include / nat.h

diff --git a/include/nat.h b/include/nat.h
index c35401ceb2ddad152248871e9bd51f2ad08e114c..926740bc7c9b4e2fd5a7c3cf247f7a77c12ea0e6 100644 (file)
--- a/include/nat.h
+++ b/include/nat.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-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -31,6 +31,8 @@
  *     Thomas Ruschak
  *     Ken Stevens, 1995
  *     Steve McClure, 1998-2000
+ *     Ron Koenderink, 2005-2008
+ *     Markus Armbruster, 2005-2008
  */
 
 #ifndef NAT_H
@@ -68,9 +70,10 @@ enum nat_status {
  */
 struct realmstr {
     /* initial part must match struct empobj */
-    short ef_type;
-    short r_uid;               /* realm table index */
-    unsigned r_seqno;
+    signed ef_type: 8;
+    unsigned r_seqno: 12;
+    unsigned r_generation: 12;
+    int r_uid;                 /* realm table index */
     time_t r_timestamp;                /* Last time this realm was touched */
     natid r_cnum;              /* country number */
     /* end of part matching struct empobj */
@@ -81,9 +84,10 @@ struct realmstr {
 
 struct natstr {
     /* initial part must match struct empobj */
-    short ef_type;
-    short nat_uid;             /* equals nat_cnum */
-    unsigned nat_seqno;
+    signed ef_type: 8;
+    unsigned nat_seqno: 12;
+    unsigned nat_generation: 12;
+    int nat_uid;               /* equals nat_cnum */
     time_t nat_timestamp;
     natid nat_cnum;            /* our country number */
     /* end of part matching struct empobj */