From ab78d925eca17ea6243da6d82f2b2ee55945a2b9 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 29 Dec 2022 17:34:06 +0200 Subject: [PATCH 25/25] Make units always to have their builder's nationality again This reverts the rule change (relative to 3.0) that units with pop_cost get their nationality from the citizens that were used to build them. Without configurability, it broke compatibility with old rulesets that rely on old hardcoded behavior. The feature is expected to come back in a better form in 3.2. Anonymously reported See osdn #45932 Signed-off-by: Marko Lindqvist --- server/cityturn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/cityturn.c b/server/cityturn.c index 07c9769d67..64e0249b6d 100644 --- a/server/cityturn.c +++ b/server/cityturn.c @@ -2525,7 +2525,7 @@ static struct unit *city_create_unit(struct city *pcity, if (pop_cost > 0 && pcity->nationality) { /* We don't reduce city size in-place to keep it correct and * existing at all while we call the following callback */ - punit->nationality = citizens_unit_nationality(pcity, pop_cost, red); + citizens_unit_nationality(pcity, pop_cost, red); } else if (red) { red->change = 0; } -- 2.39.0