From d0ecb9b7eed55c241d3077379cbdb92c78615e55 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 6 Jun 2006 17:57:30 +0000 Subject: [PATCH] (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. --- include/product.h | 18 ++---------------- src/lib/global/product.c | 2 +- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/include/product.h b/include/product.h index bb6dc86ee..1c6b373cb 100644 --- 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 */ }; -#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 diff --git a/src/lib/global/product.c b/src/lib/global/product.c index 37b80c5fd..eef142a9f 100644 --- 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). */ -struct pchrstr pchr[P_URAN + 2]; +struct pchrstr pchr[P_MAX + 2]; -- 2.43.0