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/game | |
| parent | fcf06ba4c43bb9b7ac0b8541377a5240b3e01126 (diff) | |
| download | openttd-5b34c8019f135afd9f20d043a489ab96f286038a.tar.xz | |
Codechange: Remove Company/OwnerByte types
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/game_core.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game/game_core.cpp b/src/game/game_core.cpp index 181e8b6bb..394b77fb8 100644 --- a/src/game/game_core.cpp +++ b/src/game/game_core.cpp @@ -45,7 +45,7 @@ Game::frame_counter++; - Backup<CompanyByte> cur_company(_current_company, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, FILE_LINE); cur_company.Change(OWNER_DEITY); Game::instance->GameLoop(); cur_company.Restore(); @@ -84,7 +84,7 @@ config->AnchorUnchangeableSettings(); - Backup<CompanyByte> cur_company(_current_company, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, FILE_LINE); cur_company.Change(OWNER_DEITY); Game::info = info; @@ -98,7 +98,7 @@ /* static */ void Game::Uninitialize(bool keepConfig) { - Backup<CompanyByte> cur_company(_current_company, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, FILE_LINE); delete Game::instance; Game::instance = nullptr; @@ -158,7 +158,7 @@ } /* Queue the event */ - Backup<CompanyByte> cur_company(_current_company, OWNER_DEITY, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, OWNER_DEITY, FILE_LINE); Game::instance->InsertEvent(event); cur_company.Restore(); @@ -207,7 +207,7 @@ /* static */ void Game::Save() { if (Game::instance != nullptr && (!_networking || _network_server)) { - Backup<CompanyByte> cur_company(_current_company, OWNER_DEITY, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, OWNER_DEITY, FILE_LINE); Game::instance->Save(); cur_company.Restore(); } else { @@ -218,7 +218,7 @@ /* static */ void Game::Load(int version) { if (Game::instance != nullptr && (!_networking || _network_server)) { - Backup<CompanyByte> cur_company(_current_company, OWNER_DEITY, FILE_LINE); + Backup<CompanyID> cur_company(_current_company, OWNER_DEITY, FILE_LINE); Game::instance->Load(version); cur_company.Restore(); } else { |