Spell ID and UID consistently all-caps

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

include/file.h

@@ -55,7 +55,7 @@ struct empfile {
     /* flags bits EFF_MEM, EFF_PRIVATE, EFF_NOTIME also fixed then */
 
     /* Members whose values may vary throughout operation */
-    int baseid;			/* id of first entry in cache */
+    int baseid;			/* ID of first entry in cache */
     int cids;			/* # entries in cache */
     int fids;			/* # entries in table */
     int fd;			/* file descriptor, -1 if not open */
@@ -68,13 +68,13 @@ struct empfile {
      */
     void (*oninit)(void *elt);
     /*
-     * Called after read.  @id is the element id, and @elt is the
+     * Called after read.  @id is the element ID, and @elt is the
      * element read.  May modify the element.  Modifications are
      * visible to caller of ef_read(), but have no effect on the file.
      */
     void (*postread)(int id, void *elt);
     /*
-     * Called before write.  @id is the element id, @old is the
+     * Called before write.  @id is the element ID, @old is the
      * element being updated (null unless it is cached) and @elt is
      * the element being written.  May modify the element.
      * Modifications will be visible to caller of ef_write() and are

include/land.h

@@ -50,7 +50,7 @@ struct lndstr {
     signed ef_type: 8;
     unsigned lnd_seqno: 12;
     unsigned lnd_generation: 12;
-    int lnd_uid;		/* unit id (land #) */
+    int lnd_uid;		/* unit ID (land #) */
     time_t lnd_timestamp;	/* Last time this unit was touched */
     natid lnd_own;		/* owner's country num */
     coord lnd_x;		/* x location in abs coords */
@@ -65,7 +65,7 @@ struct lndstr {
     short lnd_mission;		/* mission code */
     short lnd_radius;		/* mission radius */
     /* end of part matching struct empobj */
-    int lnd_ship;		/* uid of transporting ship, or -1 */
+    int lnd_ship;		/* UID of transporting ship, or -1 */
     signed char lnd_harden;	/* fortification */
     short lnd_retreat;		/* retreat percentage */
     int lnd_rflags;		/* When do I retreat? */
@@ -74,7 +74,7 @@ struct lndstr {
     short lnd_item[I_MAX+1];	/* amount of items on board */
     short lnd_pstage;		/* plague stage */
     short lnd_ptime;		/* how many ETUs remain in this stage */
-    int lnd_land;		/* uid of transporting land unit, or -1 */
+    int lnd_land;		/* UID of transporting land unit, or -1 */
     short lnd_access;		/* Last tick mob was updated (MOB_ACCESS) */
 };
 

include/lost.h

@@ -46,7 +46,7 @@ struct loststr {
     natid lost_owner;		/* Who lost it */
     /* end of part matching struct empobj */
     short lost_type;		/* Type of thing (ship, plane, nuke, land, sector) */
-    int lost_id;		/* uid of lost thing (0 for sector) */
+    int lost_id;		/* UID of lost thing (0 for sector) */
     coord lost_x;
     coord lost_y;
 };

include/nsc.h

@@ -60,7 +60,7 @@ enum nsc_type {
     NSC_FLOAT,			/* float */
     NSC_STRINGY,		/* char[] */
     /* aliases, must match typedefs */
-    NSC_NATID = NSC_UCHAR	/* nation id */
+    NSC_NATID = NSC_UCHAR	/* nation ID */
 };
 
 /* Is TYPE a promoted value type? */

include/nuke.h

@@ -46,7 +46,7 @@ struct nukstr {
     signed ef_type: 8;
     unsigned nuk_seqno: 12;
     unsigned nuk_generation: 12;
-    int nuk_uid;		/* unit id (nuke #) */
+    int nuk_uid;		/* unit ID (nuke #) */
     time_t nuk_timestamp;	/* Last time this nuke was touched */
     natid nuk_own;
     coord nuk_x, nuk_y;		/* current loc of device */
@@ -60,7 +60,7 @@ struct nukstr {
     short nuk_mission;		/* mission code, unused */
     short nuk_radius;		/* mission radius, unused */
     /* end of part matching struct empobj */
-    int nuk_plane;		/* uid of transporting plane, or -1 */
+    int nuk_plane;		/* UID of transporting plane, or -1 */
 };
 
 struct nchrstr {

include/plane.h

@@ -49,7 +49,7 @@ struct plnstr {
     signed ef_type: 8;
     unsigned pln_seqno: 12;
     unsigned pln_generation: 12;
-    int pln_uid;		/* unit id (plane #) */
+    int pln_uid;		/* unit ID (plane #) */
     time_t pln_timestamp;	/* Last time this plane was touched */
     natid pln_own;		/* owning country */
     coord pln_x;		/* plane x-y */
@@ -67,8 +67,8 @@ struct plnstr {
     /* end of part matching struct empobj */
     unsigned char pln_range;	/* total distance, not radius */
     signed char pln_harden;	/* for missiles */
-    int pln_ship;		/* uid of carrier, or -1 */
-    int pln_land;		/* uid of transporting land unit, or -1 */
+    int pln_ship;		/* UID of carrier, or -1 */
+    int pln_land;		/* UID of transporting land unit, or -1 */
     int pln_flags;		/* State of the plane */
     short pln_access;		/* Last tick mob was updated (MOB_ACCESS) */
     float pln_theta;		/* position in orbital sine wave */

include/player.h

@@ -84,7 +84,7 @@ struct player {
     int aborted;		/* command aborted? */
     int got_ctld;		/* EOF cookie received? */
     int recvfail;		/* #recvclient() failures */
-    int curid;			/* for pr, cur. line's id, -1 none */
+    int curid;			/* for pr, cur. line's ID, -1 none */
     char *map;			/* pointer to in-mem map */
     char *bmap;			/* pointer to in-mem bmap */
 };

include/sect.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;