From 66256e6c2ec135a4a75869e319ad5476f6392acd Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 4 Mar 2023 11:08:01 +0200 Subject: [PATCH 19/19] Allow ai type fallback when loading regular savegame See osdn #47521 Signed-off-by: Marko Lindqvist --- server/savegame/savegame2.c | 4 +++- server/savegame/savegame3.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/savegame/savegame2.c b/server/savegame/savegame2.c index cc1fa09d81..c06ded2e11 100644 --- a/server/savegame/savegame2.c +++ b/server/savegame/savegame2.c @@ -2510,7 +2510,9 @@ static void sg_load_players_basic(struct loaddata *loading) /* Create player. */ pplayer = server_create_player(player_slot_index(pslot), str, - prgbcolor, game.scenario.allow_ai_type_fallback); + prgbcolor, + !game.scenario.is_scenario + || game.scenario.allow_ai_type_fallback); sg_failure_ret(pplayer != NULL, "Invalid AI type: '%s'!", str); server_player_init(pplayer, FALSE, FALSE); diff --git a/server/savegame/savegame3.c b/server/savegame/savegame3.c index 1a42c82160..90c0fcef3a 100644 --- a/server/savegame/savegame3.c +++ b/server/savegame/savegame3.c @@ -3597,7 +3597,9 @@ static void sg_load_players_basic(struct loaddata *loading) /* Create player. */ pplayer = server_create_player(player_slot_index(pslot), str, - prgbcolor, game.scenario.allow_ai_type_fallback); + prgbcolor, + !game.scenario.is_scenario + || game.scenario.allow_ai_type_fallback); sg_failure_ret(pplayer != NULL, "Invalid AI type: '%s'!", str); server_player_init(pplayer, FALSE, FALSE); -- 2.39.2