Avoid redundant re-scans for AI and game script files

pull/104/head
Jonathan G Rennison 5 years ago
parent 66b32df7cc
commit 158f063a38

@ -184,15 +184,10 @@
AI::KillAll();
if (keepConfig) {
/* Run a rescan, which indexes all AIInfos again, and check if we can
* still load all the AIS, while keeping the configs in place */
Rescan();
/* Do not bother re-scanning AI files, just reset config */
ResetConfig();
} else {
delete AI::scanner_info;
delete AI::scanner_library;
AI::scanner_info = nullptr;
AI::scanner_library = nullptr;
/* Do not bother re-scanning AI files, just delete config */
for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
if (_settings_game.ai_config[c] != nullptr) {
delete _settings_game.ai_config[c];

@ -107,13 +107,10 @@
cur_company.Restore();
if (keepConfig) {
Rescan();
/* Do not bother re-scanning game script files, just reset config */
ResetConfig();
} else {
delete Game::scanner_info;
delete Game::scanner_library;
Game::scanner_info = nullptr;
Game::scanner_library = nullptr;
/* Do not bother re-scanning game script, just delete config */
if (_settings_game.game_config != nullptr) {
delete _settings_game.game_config;
_settings_game.game_config = nullptr;

Loading…
Cancel
Save