Update copyright notice

[empserver] / include / nat.h

diff --git a/include/nat.h b/include/nat.h
index 4adf6add33165b2bda3659d881eedea631b790be..6808f62474b226c2ff6782ab49215491635b45d6 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-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,7 +26,7 @@
  *  ---
  *
  *  nat.h: Definitions for things having to do with nations
- * 
+ *
  *  Known contributors to this file:
  *     Thomas Ruschak
  *     Ken Stevens, 1995
@@ -39,10 +39,12 @@
 #include <time.h>
 #include "types.h"
 
+#define NATID_BAD 255
+
 #define        MAXNOR          50      /* max # realms */
 
 /* Nation status */
-typedef enum {
+enum nat_status {
     /*
      * Don't change order without checking inequality comparisons and
      * array initializers!
@@ -53,7 +55,7 @@ typedef enum {
     STAT_SANCT,                        /* still in sanctuary */
     STAT_ACTIVE,               /* active (sanctuary broken) */
     STAT_GOD                   /* deity powers */
-} nat_status;
+};
 
 
 /*
@@ -67,21 +69,25 @@ typedef enum {
 struct realmstr {
     /* initial part must match struct empobj */
     short ef_type;
+    short r_uid;               /* realm table index */
+    unsigned r_seqno;
+    time_t r_timestamp;                /* Last time this realm was touched */
     natid r_cnum;              /* country number */
     /* end of part matching struct empobj */
-    short r_uid;               /* realm table index */
     unsigned short r_realm;    /* realm number */
-    short r_xl, r_xh;          /* horizontal bounds */
-    short r_yl, r_yh;          /* vertical bounds */
-    time_t r_timestamp;        /* Last time this realm was touched */
+    coord r_xl, r_xh;          /* horizontal bounds */
+    coord r_yl, r_yh;          /* vertical bounds */
 };
 
 struct natstr {
     /* initial part must match struct empobj */
     short ef_type;
+    short nat_uid;             /* equals nat_cnum */
+    unsigned nat_seqno;
+    time_t nat_timestamp;
     natid nat_cnum;            /* our country number */
     /* end of part matching struct empobj */
-    nat_status nat_stat;
+    enum nat_status nat_stat;
     char nat_cnam[20];         /* country name */
     char nat_pnam[20];         /* representative */
     char nat_hostaddr[32];     /* host addr of last user */
@@ -89,11 +95,10 @@ struct natstr {
     char nat_userid[32];       /* userid of last user, may be empty */
     coord nat_xcap, nat_ycap;  /* cap location in abs coords */
     coord nat_xorg, nat_yorg;  /* origin location in abs coords */
-    signed char nat_dayno;     /* day of the year mod 128 */
     signed char nat_update;    /* Want an update or not. */
     unsigned short nat_tgms;   /* # of telegrams to be announced */
     unsigned short nat_ann;    /* # of annos pending */
-    unsigned short nat_minused;        /* number of minutes used today */
+    int nat_timeused;          /* number of seconds used today */
     short nat_btu;             /* bureaucratic time units */
     short nat_access;          /* The tick when BTUs were last updated */
     long nat_reserve;          /* military reserves */
@@ -109,14 +114,6 @@ struct natstr {
     long nat_flags;            /* nation flags */
 };
 
-       /* nstat values */
-#define VIS            bit(0)
-#define SANCT          (bit(1) | VIS)
-#define NORM           (bit(2) | VIS)
-#define GOD            (bit(3) | NORM | VIS)
-#define        CAP             bit(6)
-#define        MONEY           bit(7)
-
        /* nation relation codes */
 #define        AT_WAR          0
 #define SITZKRIEG       1
@@ -179,12 +176,15 @@ extern void putcontact(struct natstr *np, natid them, int contact);
 extern void agecontact(struct natstr *np);
 extern int influx(struct natstr *np);
 
+extern struct natstr *nat_reset(struct natstr *, enum nat_status, coord, coord);
+extern int check_nat_name(char *cname);
+
 extern int grant_btus(struct natstr *, int );
 
 /* nation flags */
-#define NF_INFORM      bit(0)  /* Inform me of telegrams right away */
-#define NF_FLASH       bit(1)  /* Allow other players to flash me (sicko :) */
-#define NF_BEEP        bit(2)  /* Make beeping sounds when appropriate */
+#define NF_INFORM      bit(0)  /* Inform me of telegrams right away */
+#define NF_FLASH       bit(1)  /* Allow other players to flash me (sicko :) */
+#define NF_BEEP                bit(2)  /* Make beeping sounds when appropriate */
 #define NF_COASTWATCH  bit(3)  /* Turn auto-coastwatch on */
 #define NF_SONAR       bit(4)  /* Turn auto-sonar on */
 #define NF_TECHLISTS    bit(5) /* Sort lists by tech not type */