Update copyright notice

[empserver] / include / sect.h

diff --git a/include/sect.h b/include/sect.h
index 5a06d9d71f180be78012ef91489420f8dcd598ce..336b71f11930e9521c275f06ebfb6ccc45455782 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-2006, 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,28 +26,33 @@
  *  ---
  *
  *  sect.h: Definitions for things having to do with sectors.
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2004-2008
  */
 
 
 #ifndef SECT_H
 #define SECT_H
 
+#include <time.h>
 #include "item.h"
+#include "types.h"
 
 struct sctstr {
-    /* initial part must match struct genitem */
+    /* initial part must match struct empobj */
     short ef_type;
+    short sct_uid;             /* equals XYOFFSET(sct_x, sct_y) */
+    unsigned sct_seqno;
+    time_t sct_timestamp;      /* Last time this sector was written to */
     natid sct_own;             /* owner's country num */
-    short sct_elev;            /* elevation/depth */
     coord sct_x;               /* x coord of sector */
     coord sct_y;               /* y coord of sector */
-    /* end of part matching struct genitem */
-    unsigned char sct_type;    /* sector type */
+    signed char sct_type;      /* sector type */
+    /* end of part matching struct empobj */
     unsigned char sct_effic;   /* 0% to 100% */
     short sct_mobil;           /* mobility units */
     unsigned char sct_loyal;   /* updates until civilans "converted" */
@@ -60,10 +65,10 @@ struct sctstr {
     coord sct_dist_y;
     short sct_avail;           /* available workforce for "other things" */
     short sct_flags;           /* temporary flags */
-    short sct_fill;            /* gunk */
+    short sct_elev;            /* elevation/depth */
     unsigned char sct_work;    /* pct of civ actually working */
     unsigned char sct_coastal; /* is this a coastal sector? */
-    unsigned char sct_newtype; /* for changing designations */
+    signed char sct_newtype;   /* for changing designations */
     unsigned char sct_min;     /* ease of mining ore */
     unsigned char sct_gmin;    /* amount of gold ore */
     unsigned char sct_fertil;  /* fertility of soil */
@@ -81,29 +86,29 @@ struct sctstr {
     unsigned char sct_che;     /* number of guerrillas */
     natid sct_che_target;      /* nation targeted by che */
     unsigned short sct_fallout;
-    time_t sct_access;         /* Last time mob was updated (MOB_ACCESS) */
+    short sct_access;          /* Last tick mob was updated (MOB_ACCESS) */
     unsigned char sct_road;    /* Road value of a sector */
     unsigned char sct_rail;    /* Rail value of a sector */
     unsigned char sct_defense; /* Defensive value of a sector */
-    time_t sct_timestamp;      /* Last time this sector was written to */
 };
 
-typedef enum {
+enum d_navigation {
     NAV_NONE,  /* ships can't navigate */
     NAVOK,     /* ships can always navigate */
     NAV_02,    /* requires 2% effic to navigate */
     NAV_CANAL, /* requires 2% effic to navigate and M_CANAL capability */
     NAV_60     /* requires 60% effic to navigate */
-} d_navigation;
+};
 
 struct dchrstr {
     unsigned char d_uid;
     char d_mnem;               /* map symbol */
+    unsigned char d_terrain;   /* terrain sector type */
     int d_prd;                 /* product type */
     int d_peffic;              /* process efficiency, in percent */
     float d_mob0, d_mob1;      /* movement cost at 0 and 100% eff */
-    d_navigation d_nav;                /* navigation capability */
-    i_packing d_pkg;           /* type of packaging in these sects */
+    enum d_navigation d_nav;   /* navigation capability */
+    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 */
@@ -151,19 +156,18 @@ struct dchrstr {
 #define SCT_ENLIST     31      /* enlistment center */
 #define SCT_PLAINS      32     /* plains sector */
 #define SCT_BTOWER      33     /* Bridge tower */
-#define        SCT_MAXDEF      33      /* highest sector type in header files */
 
-#define SCT_EFFIC       34     /* used in update & budget */
+#define SCT_TYPE_MAX    38
 
 #define getsect(x, y, p) ef_read(EF_SECTOR, sctoff((x), (y)), (p))
-#define putsect(p) ef_write(EF_SECTOR, sctoff((p)->sct_x, (p)->sct_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))
 
 /* things relating to sectors */
 extern int sctoff(coord x, coord y);
 
-extern struct dchrstr dchr[SCT_MAXDEF + 2];
+extern struct dchrstr dchr[SCT_TYPE_MAX + 2];
 extern struct dchrstr bigcity_dchr;
 #define IS_BIG_CITY(type) (dchr[(type)].d_pkg == UPKG)
 
@@ -179,6 +183,11 @@ extern struct dchrstr bigcity_dchr;
 
 #define FORTEFF 5              /* forts must be 5% efficient to fire. */
 
+/* Can trains enter sector SP? */
+#define SCT_HAS_RAIL(sp)                                       \
+    (opt_RAILWAYS ? sct_rail_track((sp)) != 0                  \
+     : intrchr[INT_RAIL].in_enable && (sp)->sct_rail != 0)
+
 #define MOB_MOVE    0
 #define MOB_MARCH   1
 #define MOB_RAIL    2
@@ -213,4 +222,7 @@ struct sctintrins {
 
 extern struct sctintrins intrchr[INT_DEF + 2];
 
+extern int fort_fire(struct sctstr *);
+extern int sct_rail_track(struct sctstr *);
+
 #endif