From 5a725c91774d4e48186d7ed899a3b015d0aecb11 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 19 Aug 2004 17:45:36 +0000 Subject: [PATCH] (nullify_objects): Use SCT_MAXDEF instead of sct_maxno. Loop no longer covers the extra empty slots at the end of the dchr[]; doesn't matter. (sct_maxno): Unused, remove. --- include/sect.h | 3 +-- src/lib/global/sect.c | 2 -- src/server/main.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/sect.h b/include/sect.h index 6a40eff0e..56092de68 100644 --- a/include/sect.h +++ b/include/sect.h @@ -90,7 +90,7 @@ struct sctstr { struct dchrstr { int d_mnem; /* map symbol */ - int d_prd; /* product vtype */ + int d_prd; /* product type */ int d_mcst; /* movement cost */ int d_flg; /* movement cost */ i_packing d_pkg; /* type of packaging in these sects */ @@ -162,7 +162,6 @@ struct dchrstr { /* things relating to sectors */ extern int sctoff(coord x, coord y); -extern int sct_maxno; extern struct dchrstr dchr[]; extern struct dchrstr bigcity_dchr; diff --git a/src/lib/global/sect.c b/src/lib/global/sect.c index d56d9dc81..27ddacc76 100644 --- a/src/lib/global/sect.c +++ b/src/lib/global/sect.c @@ -86,8 +86,6 @@ struct dchrstr dchr[SCT_MAXDEF + 2] = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }; -int sct_maxno = (sizeof(dchr) / sizeof(struct dchrstr)) - 1; - struct sctintrins intrchr[] = { /* name lcm hcm dollars mobility */ {"road network", 2, 2, 2, 1}, diff --git a/src/server/main.c b/src/server/main.c index 5889356be..708b0b5f7 100644 --- a/src/server/main.c +++ b/src/server/main.c @@ -432,7 +432,7 @@ nullify_objects(void) if (opt_NO_LCMS) nchr[i].n_lcm = 0; } - for (i = 0; i < sct_maxno; i++) { + for (i = 0; i <= SCT_MAXDEF; i++) { if (opt_NO_HCMS) dchr[i].d_hcms = 0; if (opt_NO_LCMS) -- 2.43.0