(P_MAX): New.

(pchr): Use it rather than P_URAN.
(P_SHELL, P_GUN, P_PETROL, P_IRON, P_DUST, P_BAR, P_FOOD, P_OIL)
(P_LCM, P_HCM, P_TLEV, P_RLEV, P_ELEV, P_HLEV, P_URAN): Unused,
remove.

diff --git a/include/product.h b/include/product.h
index bb6dc86ee1248a90a81948a185028654fc895ccc..1c6b373cba5c28845efc0a76cc990d8093425631 100644 (file)
--- a/include/product.h
+++ b/include/product.h
@@ -58,22 +58,8 @@ struct pchrstr {
     char *p_sname;             /* short (7 char or less) name of product */
 };
 
     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
+#define P_MAX 14

 
 

-extern struct pchrstr pchr[P_URAN + 2];
+extern struct pchrstr pchr[P_MAX + 2];

 
 #endif
 
 #endif

diff --git a/src/lib/global/product.c b/src/lib/global/product.c
index 37b80c5fd9e7a28da0b9b8f02ca991a2faa75f04..eef142a9f4abd2d950d750dfd4a58fea0a3d4b0f 100644 (file)
--- a/src/lib/global/product.c
+++ b/src/lib/global/product.c
@@ -40,4 +40,4 @@
  * Table of product types
  * Initialized on startup from product.config and deity custom config (if any).
  */
  * Table of product types
  * Initialized on startup from product.config and deity custom config (if any).
  */

-struct pchrstr pchr[P_URAN + 2];
+struct pchrstr pchr[P_MAX + 2];