diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/saveload/ai_sl.cpp | 39 | ||||
| -rw-r--r-- | src/settings.cpp | 9 |
2 files changed, 29 insertions, 19 deletions
diff --git a/src/saveload/ai_sl.cpp b/src/saveload/ai_sl.cpp index 4c3e169dd..c88dcbc32 100644 --- a/src/saveload/ai_sl.cpp +++ b/src/saveload/ai_sl.cpp @@ -29,8 +29,14 @@ static void SaveReal_AIPL(int *index_ptr) CompanyID index = (CompanyID)*index_ptr; AIConfig *config = AIConfig::GetConfig(index); - ttd_strlcpy(_ai_saveload_name, config->GetName(), lengthof(_ai_saveload_name)); - _ai_saveload_version = config->GetVersion(); + if (config->HasAI()) { + ttd_strlcpy(_ai_saveload_name, config->GetName(), lengthof(_ai_saveload_name)); + _ai_saveload_version = config->GetVersion(); + } else { + /* No AI is configured for this so store an empty string as name. */ + _ai_saveload_name[0] = '\0'; + _ai_saveload_version = -1; + } _ai_saveload_settings[0] = '\0'; config->SettingsToString(_ai_saveload_settings, lengthof(_ai_saveload_settings)); @@ -54,18 +60,23 @@ static void Load_AIPL() _ai_saveload_version = -1; SlObject(NULL, _ai_company); - config->ChangeAI(_ai_saveload_name, _ai_saveload_version); - if (!config->HasAI()) { - if (strcmp(_ai_saveload_name, "%_dummy") != 0) { - DEBUG(ai, 0, "The savegame has an AI by the name '%s', version %d which is no longer available.", _ai_saveload_name, _ai_saveload_version); - DEBUG(ai, 0, "A random other AI will be loaded in its place."); - } else { - DEBUG(ai, 0, "The savegame had no AIs available at the time of saving."); - DEBUG(ai, 0, "A random available AI will be loaded now."); + if (StrEmpty(_ai_saveload_name)) { + /* A random AI. */ + config->ChangeAI(NULL); + } else { + config->ChangeAI(_ai_saveload_name, _ai_saveload_version); + if (!config->HasAI()) { + if (strcmp(_ai_saveload_name, "%_dummy") != 0) { + DEBUG(ai, 0, "The savegame has an AI by the name '%s', version %d which is no longer available.", _ai_saveload_name, _ai_saveload_version); + DEBUG(ai, 0, "A random other AI will be loaded in its place."); + } else { + DEBUG(ai, 0, "The savegame had no AIs available at the time of saving."); + DEBUG(ai, 0, "A random available AI will be loaded now."); + } + /* Make sure the AI doesn't get the saveload data, as he was not the + * writer of the saveload data in the first place */ + _ai_saveload_version = -1; } - /* Make sure the AI doesn't get the saveload data, as he was not the - * writer of the saveload data in the first place */ - _ai_saveload_version = -1; } config->StringToSettings(_ai_saveload_settings); @@ -81,8 +92,6 @@ static void Load_AIPL() static void Save_AIPL() { for (int i = COMPANY_FIRST; i < MAX_COMPANIES; i++) { - if (!AIConfig::GetConfig((CompanyID)i)->HasAI()) continue; - SlSetArrayIndex(i); SlAutolength((AutolengthProc *)SaveReal_AIPL, &i); } diff --git a/src/settings.cpp b/src/settings.cpp index 02497e1f4..a4d3fb516 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1716,8 +1716,10 @@ static void AILoadConfig(IniFile *ini, const char *grpname) config->ChangeAI(item->name); if (!config->HasAI()) { - if (strcmp(item->name, "none") != 0) DEBUG(ai, 0, "The AI by the name '%s' was no longer found, and removed from the list.", item->name); - continue; + if (strcmp(item->name, "none") != 0) { + DEBUG(ai, 0, "The AI by the name '%s' was no longer found, and removed from the list.", item->name); + continue; + } } config->StringToSettings(item->value); } @@ -1801,12 +1803,11 @@ static void AISaveConfig(IniFile *ini, const char *grpname) AIConfig *config = AIConfig::GetConfig(c, true); const char *name; char value[1024]; + config->SettingsToString(value, lengthof(value)); if (config->HasAI()) { - config->SettingsToString(value, lengthof(value)); name = config->GetName(); } else { - value[0] = '\0'; name = "none"; } |