From a95fab7a2ad5348b2a318bf41906f2e4e24b3a18 Mon Sep 17 00:00:00 2001 From: Dino Date: Sun, 8 Nov 2026 22:46:03 -0500 Subject: [PATCH] output_type_iterate(): fix so cpp compiles OK RM #2445 --- common/city.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/common/city.h b/common/city.h index 2dedfce0c7..f05a0fd94e 100644 --- a/common/city.h +++ b/common/city.h @@ -839,11 +839,17 @@ bool city_exist(int id); /* Iterates over all output types in the game. */ +/* Hacked so cpp will compile it without + * error: assigning to 'Output_type_id' (aka 'output_type_id') + * from incompatible type 'int' + * see RM #2445. + */ #define output_type_iterate(output) \ { \ Output_type_id output; \ \ - for (output = 0; output < O_LAST; output++) { + for (int index = 0; index < (int)O_LAST; index++) {\ + output = (Output_type_id) index; #define output_type_iterate_end \ } \ -- 2.31.0