Use int instead of long for military reserves

[empserver] / include / nat.h

diff --git a/include/nat.h b/include/nat.h
index fd01289e7304c0c22a7a99b57055ccdb7b39b26b..fc7f6aeab3b0ca15923ee799eea5bfba31a958c9 100644 (file)
--- a/include/nat.h
+++ b/include/nat.h
@@ -31,7 +31,7 @@
  *     Ken Stevens, 1995
  *     Steve McClure, 1998-2000
  *     Ron Koenderink, 2005-2008
- *     Markus Armbruster, 2005-2011
+ *     Markus Armbruster, 2005-2013
  */
 
 #ifndef NAT_H
@@ -91,6 +91,7 @@ struct natstr {
     natid nat_cnum;            /* our country number */
     /* end of part matching struct empobj */
     enum nat_status nat_stat;
+    int nat_flags;             /* nation flags */
     char nat_cnam[20];         /* country name */
     char nat_pnam[20];         /* representative */
     char nat_hostaddr[46];     /* host addr of last user */
@@ -104,7 +105,7 @@ struct natstr {
     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 */
+    int nat_reserve;           /* military reserves */
     long nat_money;            /* moola */
     time_t nat_last_login;     /* time of last login, 0 menas never */
     time_t nat_last_logout;    /* time of last logout, 0 means never */
@@ -114,7 +115,6 @@ struct natstr {
     unsigned char nat_relate[MAXNOC];
     unsigned char nat_contact[MAXNOC];
     unsigned char nat_rejects[MAXNOC];
-    long nat_flags;            /* nation flags */
 };
 
        /* nation relation codes */