diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2019-04-22 09:10:04 +0100 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2019-04-29 17:40:22 +0100 |
| commit | 5b34c8019f135afd9f20d043a489ab96f286038a (patch) | |
| tree | 84b38701d78f2348ad1e54c5cb379fc15bdcfe67 /src/ai | |
| parent | fcf06ba4c43bb9b7ac0b8541377a5240b3e01126 (diff) | |
| download | openttd-5b34c8019f135afd9f20d043a489ab96f286038a.tar.xz | |
Codechange: Remove Company/OwnerByte types
Diffstat (limited to 'src/ai')
| -rw-r--r-- | src/ai/ai_core.cpp | 18 | ||||
| -rw-r--r-- | src/ai/ai_gui.cpp | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp index cc2eb42c8..23ee16c83 100644 --- a/src/ai/ai_core.cpp +++ b/src/ai/ai_core.cpp @@ -52,7 +52,7 @@ } config->AnchorUnchangeableSettings(); - Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, company, FILE_LINE); Company *c = Company::Get(company); c->ai_info = info; @@ -76,7 +76,7 @@ assert(_settings_game.difficulty.competitor_speed <= 4); if ((AI::frame_counter & ((1 << (4 - _settings_game.difficulty.competitor_speed)) - 1)) != 0) return; - Backup<CompanyByte> cur_company(_current_company, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, FILE_LINE); const Company *c; FOR_ALL_COMPANIES(c) { if (c->is_ai) { @@ -107,7 +107,7 @@ if (_networking && !_network_server) return; PerformanceMeasurer::SetInactive((PerformanceElement)(PFE_AI0 + company)); - Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, company, FILE_LINE); Company *c = Company::Get(company); delete c->ai_instance; @@ -127,7 +127,7 @@ * for the server owner to unpause the script again. */ if (_network_dedicated) return; - Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, company, FILE_LINE); Company::Get(company)->ai_instance->Pause(); cur_company.Restore(); @@ -135,7 +135,7 @@ /* static */ void AI::Unpause(CompanyID company) { - Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, company, FILE_LINE); Company::Get(company)->ai_instance->Unpause(); cur_company.Restore(); @@ -143,7 +143,7 @@ /* static */ bool AI::IsPaused(CompanyID company) { - Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, company, FILE_LINE); bool paused = Company::Get(company)->ai_instance->IsPaused(); cur_company.Restore(); @@ -253,7 +253,7 @@ } /* Queue the event */ - Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, company, FILE_LINE); Company::Get(_current_company)->ai_instance->InsertEvent(event); cur_company.Restore(); @@ -285,7 +285,7 @@ Company *c = Company::GetIfValid(company); assert(c != nullptr && c->ai_instance != nullptr); - Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, company, FILE_LINE); c->ai_instance->Save(); cur_company.Restore(); } else { @@ -299,7 +299,7 @@ Company *c = Company::GetIfValid(company); assert(c != nullptr && c->ai_instance != nullptr); - Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, company, FILE_LINE); c->ai_instance->Load(version); cur_company.Restore(); } else { diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index 4932c0f61..91f896904 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -810,7 +810,7 @@ struct AIConfigWindow : public Window { if (_game_mode != GM_NORMAL) { return slot > 0 && slot <= GetGameSettings().difficulty.max_no_competitors; } - if (Company::IsValidID(slot) || slot < 0) return false; + if (Company::IsValidID(slot)) return false; int max_slot = GetGameSettings().difficulty.max_no_competitors; for (CompanyID cid = COMPANY_FIRST; cid < (CompanyID)max_slot && cid < MAX_COMPANIES; cid++) { |