info/Empire4.4: Improve a few change log entries

[empserver] / include / nuke.h

diff --git a/include/nuke.h b/include/nuke.h
index a59afa3fd48c2bab8ebc7816387b19fbdcf0af6c..066224861b782fa629223263c8cff661675534fe 100644 (file)
--- a/include/nuke.h
+++ b/include/nuke.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -28,15 +28,16 @@
  *
  *  Known contributors to this file:
  *     Dave Pare, 1986
+ *     Markus Armbruster, 2004-2020
  */
 
 #ifndef NUKE_H
 #define NUKE_H
 
-#include <time.h>
+#include "file.h"
+#include "item.h"
 #include "types.h"
 
-#define N_MAXNUKE      20
 #define MIN_DRNUKE_CONST       0.001
 
 struct nukstr {
@@ -44,7 +45,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 */
@@ -53,24 +54,23 @@ struct nukstr {
     signed char nuk_mobil;     /* unused, always 0 */
     unsigned char nuk_off;     /* repairs stopped? (unused) */
     short nuk_tech;            /* nuke's tech level */
-    char nuk_stockpile;                /* group membership, unused */
+    char nuk_stockpile;                /* group membership */
     coord nuk_opx, nuk_opy;    /* Op sector coords, unused */
     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 {
     char *n_name;              /* warhead unit name */
-    int n_lcm;                 /* costs to build */
-    int n_hcm;
-    int n_oil;
-    int n_rad;
     int n_blast;               /* blast radius */
     int n_dam;                 /* damage at center */
-    int n_cost;
+    short n_mat[I_MAX+1];      /* materials to build 100% */
+                               /* only I_LCM, I_HCM, I_OIL, I_RAD non-zero */
+    int n_bwork;               /* work to build 100% */
     int n_tech;                        /* tech needed to build */
+    int n_cost;                        /* how much it costs to build */
     int n_weight;
     int n_flags;               /* description of capability */
     signed char n_type;                /* index in nchr[] */
@@ -82,11 +82,8 @@ struct nchrstr {
 #define putnuke(n, p) ef_write(EF_NUKE, (n), (p))
 #define getnukep(n) ((struct nukstr *)ef_ptr(EF_NUKE, (n)))
 
-/* Work required for building */
-#define NUK_BLD_WORK(lcm, hcm, oil, rad) \
-  (((lcm) + 2 * (hcm) + (oil) + (rad) + 4) / 5)
-
-extern struct nchrstr nchr[N_MAXNUKE + 1];
+#define NCHR_SZ 64
+extern struct nchrstr nchr[NCHR_SZ];
 
 /* src/lib/common/cargo.c */
 extern void nuk_carrier_change(struct nukstr *, int, int, int);