diff options
| author | smatz <smatz@openttd.org> | 2009-06-10 22:05:01 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-06-10 22:05:01 +0000 |
| commit | bea3fe2b8b2352d471149a4c914f93c58aa11b83 (patch) | |
| tree | 69bd9a4b24333a7da3f2f3d11af4aafff5c92583 /src/saveload | |
| parent | bc7e9514d247581e085b80a71dabbd6e635e5ded (diff) | |
| download | openttd-bea3fe2b8b2352d471149a4c914f93c58aa11b83.tar.xz | |
(svn r16559) -Codechange: introduce Company::IsValidAiID() and Company::IsValidHumanID(), don't use IsHumanCompany() where possible
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/ai_sl.cpp | 6 | ||||
| -rw-r--r-- | src/saveload/company_sl.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/saveload/ai_sl.cpp b/src/saveload/ai_sl.cpp index 4001fb81f..d5687db54 100644 --- a/src/saveload/ai_sl.cpp +++ b/src/saveload/ai_sl.cpp @@ -43,7 +43,7 @@ static void SaveReal_AIPL(int *index_ptr) SlObject(NULL, _ai_company); /* If the AI was active, store his data too */ - if (Company::IsValidID(index) && !IsHumanCompany(index)) AI::Save(index); + if (Company::IsValidAiID(index)) AI::Save(index); } static void Load_AIPL() @@ -59,7 +59,7 @@ static void Load_AIPL() SlObject(NULL, _ai_company); if (_networking && !_network_server) { - if (Company::IsValidID(index) && !IsHumanCompany(index)) AIInstance::LoadEmpty(); + if (Company::IsValidAiID(index)) AIInstance::LoadEmpty(); continue; } @@ -86,7 +86,7 @@ static void Load_AIPL() config->StringToSettings(_ai_saveload_settings); /* Start the AI directly if it was active in the savegame */ - if (Company::IsValidID(index) && !IsHumanCompany(index)) { + if (Company::IsValidAiID(index)) { AI::StartNew(index); AI::Load(index, _ai_saveload_version); } diff --git a/src/saveload/company_sl.cpp b/src/saveload/company_sl.cpp index 940b561be..9040b7521 100644 --- a/src/saveload/company_sl.cpp +++ b/src/saveload/company_sl.cpp @@ -227,7 +227,7 @@ static void SaveLoad_PLYR(Company *c) SlObject(c, _company_desc); /* Keep backwards compatible for savegames, so load the old AI block */ - if (CheckSavegameVersion(107) && !IsHumanCompany(c->index)) { + if (CheckSavegameVersion(107) && c->is_ai) { CompanyOldAI old_ai; char nothing; |