Update copyright notice

[empserver] / include / sect.h

diff --git a/include/sect.h b/include/sect.h
index 4f68bda638a018a12d752d843811bb296a5f067e..aa60b58c037540984440ff9479bf60a719f4f6e7 100644 (file)
--- a/include/sect.h
+++ b/include/sect.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -37,7 +37,7 @@
 #ifndef SECT_H
 #define SECT_H
 
-#include <time.h>
+#include "file.h"
 #include "item.h"
 #include "types.h"
 
@@ -57,10 +57,10 @@ struct sctstr {
     unsigned char sct_off;     /* Should this sector produce? */
     /* end of part matching struct empobj */
     unsigned char sct_loyal;   /* updates until civilans "converted" */
-    unsigned char sct_terr;    /* territory 0 id # of sector */
-    unsigned char sct_terr1;   /* territory 1 id # of sector */
-    unsigned char sct_terr2;   /* territory 2 id # of sector */
-    unsigned char sct_terr3;   /* territory 3 id # of sector */
+    unsigned char sct_terr;    /* territory 0 number */
+    unsigned char sct_terr1;   /* territory 1 number */
+    unsigned char sct_terr2;   /* territory 2 number */
+    unsigned char sct_terr3;   /* territory 3 number */
     unsigned char sct_dterr;   /* deity's territory # */
     coord sct_dist_x;          /* Dist sector */
     coord sct_dist_y;
@@ -82,7 +82,7 @@ struct sctstr {
     short sct_dist[I_MAX+1];   /* distribution thresholds */
     short sct_mines;           /* number of mines */
     short sct_pstage;          /* plague stage */
-    short sct_ptime;           /* how many etus remain in this stage */
+    short sct_ptime;           /* how many ETUs remain in this stage */
     unsigned char sct_che;     /* number of guerrillas */
     natid sct_che_target;      /* nation targeted by che */
     unsigned short sct_fallout;
@@ -111,7 +111,6 @@ struct dchrstr {
     enum i_packing d_pkg;      /* type of packaging in these sects */
     float d_ostr;              /* offensive strength */
     float d_dstr;              /* defensive strength */
-    int d_value;               /* resale ("collect") value */
     short d_mat[I_MAX+1];      /* materials to build 100% */
                                /* only I_LCM and I_HCM non-zero */
     int d_bwork;               /* work to build 100% */
@@ -165,8 +164,8 @@ struct dchrstr {
 
 #define getsect(x, y, p) ef_read(EF_SECTOR, sctoff((x), (y)), (p))
 #define putsect(p) ef_write(EF_SECTOR, (p)->sct_uid, (p))
-#define getsectp(x, y) (struct sctstr *)ef_ptr(EF_SECTOR, sctoff((x), (y)))
-#define getsectid(id) (struct sctstr *)ef_ptr(EF_SECTOR, (id))
+#define getsectp(x, y) ((struct sctstr *)ef_ptr(EF_SECTOR, sctoff((x), (y))))
+#define getsectid(id) ((struct sctstr *)ef_ptr(EF_SECTOR, (id)))
 
 extern struct dchrstr dchr[SCT_TYPE_MAX + 2];
 #define IS_BIG_CITY(type) (dchr[(type)].d_pkg == UPKG)
@@ -217,10 +216,10 @@ extern struct dchrstr dchr[SCT_TYPE_MAX + 2];
 /* Each cost is per point of efficency */
 struct sctintrins {
     char *in_name;
-    unsigned char in_lcms;     /* construction materials */
-    unsigned char in_hcms;
-    unsigned char in_dcost;    /* dollars */
-    unsigned char in_mcost;    /* mobility */
+    short in_mat[I_MAX+1];     /* materials to build 100% */
+                               /* non-zero only for I_LCM and I_HCM */
+    short in_bmobil;           /* mobility to build 100% */
+    int in_cost;               /* cost to build 100% */
     unsigned char in_enable;   /* enabled iff non-zero */
 };