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

On load, use previous local company or first usable company

Browse Source 
Instead of always using the first company slot
This commit is contained in:
Jonathan G Rennison
2020-09-20 17:36:36 +01:00
parent 9af2c258fa
commit 4763f441f6
8 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openttd.cpp
View File

@@ -434,6 +434,7 @@ static void ShutdownGame()
ClearCommandLog();
ClearDesyncMsgLog();
_loaded_local_company = COMPANY_SPECTATOR;
_game_events_since_load = (GameEventFlags) 0;
_game_events_overall = (GameEventFlags) 0;
_game_load_cur_date_ymd = { 0, 0, 0 };
@@ -1233,8 +1234,8 @@ void SwitchToMode(SwitchMode new_mode)
EngineOverrideManager::ResetToCurrentNewGRFConfig();
}
/* Update the local company for a loaded game. It is either always
* company #1 (eg 0) or in the case of a dedicated server a spectator */
SetLocalCompany(_network_dedicated ? COMPANY_SPECTATOR : COMPANY_FIRST);
* a company or in the case of a dedicated server a spectator */
SetLocalCompany(_network_dedicated ? COMPANY_SPECTATOR : GetDefaultLocalCompany());
if (_ctrl_pressed && !_network_dedicated) {
DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE);
}