dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: use std::source_location over __FILE__ and __LINE__ for Backup

Browse Source
This commit is contained in:
Rubidium
2024-01-17 03:33:23 +01:00
committed by rubidium42
parent 381dee2e01
commit bab5a8a787
26 changed files with 65 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/game/game_core.cpp
View File

@@ -43,7 +43,7 @@
Game::frame_counter++;
Backup<CompanyID> cur_company(_current_company, FILE_LINE);
Backup<CompanyID> cur_company(_current_company);
cur_company.Change(OWNER_DEITY);
Game::instance->GameLoop();
cur_company.Restore();
@@ -85,7 +85,7 @@
config->AnchorUnchangeableSettings();
Backup<CompanyID> cur_company(_current_company, FILE_LINE);
Backup<CompanyID> cur_company(_current_company);
cur_company.Change(OWNER_DEITY);
Game::info = info;
@@ -101,7 +101,7 @@
/* static */ void Game::Uninitialize(bool keepConfig)
{
Backup<CompanyID> cur_company(_current_company, FILE_LINE);
Backup<CompanyID> cur_company(_current_company);
delete Game::instance;
Game::instance = nullptr;
@@ -161,7 +161,7 @@
}
/* Queue the event */
Backup<CompanyID> cur_company(_current_company, OWNER_DEITY, FILE_LINE);
Backup<CompanyID> cur_company(_current_company, OWNER_DEITY);
Game::instance->InsertEvent(event);
cur_company.Restore();
@@ -211,7 +211,7 @@
/* static */ void Game::Save()
{
if (Game::instance != nullptr && (!_networking || _network_server)) {
Backup<CompanyID> cur_company(_current_company, OWNER_DEITY, FILE_LINE);
Backup<CompanyID> cur_company(_current_company, OWNER_DEITY);
Game::instance->Save();
cur_company.Restore();
} else {