X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=include%2Fproduct.h;h=79d532dd4f2058880cbc8aeeb8a46494b73a3a47;hp=fb299d88276f215cd4b4b5d3503a21ddc1475ccd;hb=1d8451e87b7f58943c087c54291ce883ffa90828;hpb=4515b84c59fde2fefb8ee3331f5afe64ef41fcd3

diff --git a/include/product.h b/include/product.h
index fb299d882..79d532dd4 100644
--- 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
@@ -45,7 +44,8 @@ enum { MAXPRCON = 3 };
 struct pchrstr {
     int p_uid;
     i_type p_ctype[MAXPRCON];	/* constituent types */
-    u_short p_camt[MAXPRCON];	/* constituent amounts */
+    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 */
@@ -54,28 +54,11 @@ struct pchrstr {
     int p_nlndx;		/* index (NAT_?LEV) affecting production */
     int p_nlmin;		/* minimum lvl required */
     int p_nllag;		/* lag, mul by (lvl-nlmin)/(lvl-nlmin+nllag) */
-    int p_effic;		/* process efficiency, mult by p_effic/100 */
     char *p_name;		/* name of product */
     char *p_sname;		/* short (7 char or less) name of product */
 };
 
-#define	P_SHELL	1
-#define	P_GUN	2
-#define	P_PETROL	3
-#define	P_IRON	4
-#define	P_DUST	5
-#define	P_BAR	6
-#define	P_FOOD	7
-#define	P_OIL	8
-#define	P_LCM	9
-#define	P_HCM	10
-#define	P_TLEV	11
-#define	P_RLEV	12
-#define	P_ELEV	13
-#define	P_HLEV	14
-#define P_URAN	15
-#define P_MDUST	16
-
-extern struct pchrstr pchr[P_MDUST + 2];
+#define PCHR_SZ 32
+extern struct pchrstr pchr[PCHR_SZ];
 
 #endif