client: Unbreak standalone build

[empserver] / include / product.h

diff --git a/include/product.h b/include/product.h
index bb6dc86ee1248a90a81948a185028654fc895ccc..79d532dd4f2058880cbc8aeeb8a46494b73a3a47 100644 (file)
--- a/include/product.h
+++ b/include/product.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,9 +25,9 @@
  *  ---
  *
  *  product.h: Definitions for things having to do with products
- * 
+ *
  *  Known contributors to this file:
- * 
+ *
  */
 
 #ifndef PRODUCT_H
@@ -46,6 +45,7 @@ struct pchrstr {
     int p_uid;
     i_type p_ctype[MAXPRCON];  /* constituent types */
     unsigned short p_camt[MAXPRCON]; /* constituent amounts */
+    int p_bwork;               /* work to build one product unit */
     i_type p_type;             /* product item type, or I_NONE if level */
     int p_level;               /* level index (NAT_?LEV), or -1 if item */
     int p_cost;                        /* dollars / product unit */
@@ -58,22 +58,7 @@ struct pchrstr {
     char *p_sname;             /* short (7 char or less) name of product */
 };
 
-#define        P_SHELL 0
-#define        P_GUN   1
-#define        P_PETROL        2
-#define        P_IRON  3
-#define        P_DUST  4 
-#define        P_BAR   5 
-#define        P_FOOD  6 
-#define        P_OIL   7 
-#define        P_LCM   8 
-#define        P_HCM   9 
-#define        P_TLEV  10
-#define        P_RLEV  11
-#define        P_ELEV  12
-#define        P_HLEV  13
-#define P_URAN 14
-
-extern struct pchrstr pchr[P_URAN + 2];
+#define PCHR_SZ 32
+extern struct pchrstr pchr[PCHR_SZ];
 
 #endif