miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'openttd' into 1.11

Browse Source
This commit is contained in:
dP
2021-04-19 00:52:56 +03:00
parent 3e277966df 5881c752f5
commit 8601ff15c4
155 changed files with 1579 additions and 843 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/openttd.cpp
+6 -2
View File
@@ -459,7 +459,7 @@ struct AfterNewGRFScan : NewGRFScanCallback {
/* restore saved music volume */
MusicDriver::GetInstance()->SetVolume(_settings_client.music.music_vol);
if (startyear != INVALID_YEAR) _settings_newgame.game_creation.starting_year = startyear;
if (startyear != INVALID_YEAR) IConsoleSetSetting("game_creation.starting_year", startyear);
if (generation_seed != GENERATE_NEW_SEED) _settings_newgame.game_creation.generation_seed = generation_seed;
if (dedicated_host != nullptr) {
@@ -1455,11 +1455,15 @@ static void DoAutosave()
* done in the game-thread, and not in the draw-thread (which most often
* triggers this request).
* @param callback Optional callback to call when NewGRF scan is completed.
* @return True when the NewGRF scan was actually requested, false when the scan was already running.
*/
void RequestNewGRFScan(NewGRFScanCallback *callback)
bool RequestNewGRFScan(NewGRFScanCallback *callback)
{
if (_request_newgrf_scan) return false;
_request_newgrf_scan = true;
_request_newgrf_scan_callback = callback;
return true;
}
void GameLoop()