From 2584c6707c43a0b6259ead744d9aa586bd0cb055 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 26 Mar 2022 00:15:40 +0200 Subject: [PATCH 43/43] savegame3.c: Drop ai_level_convert() use No savegame3 save has ever been created with old-style ai level information, so there's no need to support it in loading. See osdn #44163 Signed-off-by: Marko Lindqvist --- server/savegame/savegame3.c | 44 ++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/server/savegame/savegame3.c b/server/savegame/savegame3.c index 4f820139d4..7c9c82f3af 100644 --- a/server/savegame/savegame3.c +++ b/server/savegame/savegame3.c @@ -2006,23 +2006,22 @@ static void sg_load_game(struct loaddata *loading) level = secfile_lookup_str_default(loading->file, NULL, "game.level"); - if (level != NULL) { - if (!fc_strcasecmp("Handicapped", level)) { - /* Up to freeciv-3.1 Restricted AI level was known as Handicapped */ - game.info.skill_level = AI_LEVEL_RESTRICTED; - } else { - game.info.skill_level = ai_level_by_name(level, fc_strcasecmp); - } + if (level != NULL && !fc_strcasecmp("Handicapped", level)) { + /* Up to freeciv-3.1 Restricted AI level was known as Handicapped */ + game.info.skill_level = AI_LEVEL_RESTRICTED; } else { - game.info.skill_level = ai_level_invalid(); + game.info.skill_level = ai_level_by_name(level, fc_strcasecmp); } if (!ai_level_is_valid(game.info.skill_level)) { - game.info.skill_level - = ai_level_convert(GAME_HARDCODED_DEFAULT_SKILL_LEVEL); + log_sg("Invalid AI level \"%s\". " + "Changed to \"%s\".", level, + ai_level_name(GAME_HARDCODED_DEFAULT_SKILL_LEVEL)); + game.info.skill_level = GAME_HARDCODED_DEFAULT_SKILL_LEVEL; } - str = secfile_lookup_str_default(loading->file, NULL, - "game.phase_mode"); + + str = secfile_lookup_str_default(loading->file, NULL, + "game.phase_mode"); if (str != NULL) { game.info.phase_mode = phase_mode_type_by_name(str, fc_strcasecmp); if (!phase_mode_type_is_valid(game.info.phase_mode)) { @@ -4109,23 +4108,18 @@ static void sg_load_player_main(struct loaddata *loading, level = secfile_lookup_str_default(loading->file, NULL, "player%d.ai.level", plrno); - if (level != NULL) { - if (!fc_strcasecmp("Handicapped", level)) { - /* Up to freeciv-3.1 Restricted AI level was known as Handicapped */ - plr->ai_common.skill_level = AI_LEVEL_RESTRICTED; - } else { - plr->ai_common.skill_level = ai_level_by_name(level, fc_strcasecmp); - } + if (level != NULL && !fc_strcasecmp("Handicapped", level)) { + /* Up to freeciv-3.1 Restricted AI level was known as Handicapped */ + plr->ai_common.skill_level = AI_LEVEL_RESTRICTED; } else { - plr->ai_common.skill_level = ai_level_invalid(); + plr->ai_common.skill_level = ai_level_by_name(level, fc_strcasecmp); } if (!ai_level_is_valid(plr->ai_common.skill_level)) { - plr->ai_common.skill_level - = ai_level_convert(secfile_lookup_int_default(loading->file, - game.info.skill_level, - "player%d.ai.skill_level", - plrno)); + log_sg("Player%d: Invalid AI level \"%s\". " + "Changed to \"%s\".", plrno, level, + ai_level_name(game.info.skill_level)); + plr->ai_common.skill_level = game.info.skill_level; } barb_str = secfile_lookup_str_default(loading->file, "None", -- 2.35.1