From 524c70659c79e2d2414fbdce99c708e881e3aedd Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 21 Aug 2020 13:12:11 +0200 Subject: [PATCH] fairland: Simplify how write_sect() iterates over sectors Iterating over IDs is slightly simpler than iterating over coordinates, so do that. Signed-off-by: Markus Armbruster --- src/util/fairland.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/util/fairland.c b/src/util/fairland.c index 8c12a8c74..097c17177 100644 --- a/src/util/fairland.c +++ b/src/util/fairland.c @@ -1434,19 +1434,17 @@ add_resources(struct sctstr *sct) static void write_sects(void) { - struct sctstr *sct; - int x, y; + struct sctstr *sp; + int i; - for (y = 0; y < WORLD_Y; y++) { - for (x = y % 2; x < WORLD_X; x += 2) { - sct = getsectp(x, y); - sct->sct_elev = elev[sct->sct_uid]; - sct->sct_type = elev_to_sct_type(sct->sct_elev); - sct->sct_newtype = sct->sct_type; - sct->sct_dterr = own[sct->sct_uid] + 1; - sct->sct_coastal = is_coastal(sct->sct_x, sct->sct_y); - add_resources(sct); - } + for (i = 0; i < WORLD_SZ(); i++) { + sp = getsectid(i); + sp->sct_elev = elev[i]; + sp->sct_type = elev_to_sct_type(sp->sct_elev); + sp->sct_newtype = sp->sct_type; + sp->sct_dterr = own[i] + 1; + sp->sct_coastal = is_coastal(sp->sct_x, sp->sct_y); + add_resources(sp); } } -- 2.43.0