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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/fios.h
This commit is contained in:
Jonathan G Rennison
2017-01-17 19:11:09 +00:00
parent 1ff60c44bf 2335acdc16
commit 90cd312428
94 changed files with 546 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openttd.cpp
View File

@@ -385,7 +385,6 @@ static void LoadIntroGame(bool load_newgrfs = true)
_pause_mode = PM_UNPAUSED;
_cursor.fix_at = false;
if (load_newgrfs) CheckForMissingSprites();
CheckForMissingGlyphs();
/* Play main theme */
@@ -894,8 +893,8 @@ int openttd_main(int argc, char *argv[])
free(musicdriver);
// Check if not too much GRFs are loaded for network game
if (dedicated && CountSelectedGRFs( _grfconfig ) >= MAX_FILE_SLOTS_IN_NETWORK) {
DEBUG(net, 0, "Too many GRF loaded. Max %d are allowed.\nExiting ...", MAX_FILE_SLOTS_IN_NETWORK);
if (dedicated && CountSelectedGRFs(_grfconfig) > NETWORK_MAX_GRF_COUNT) {
DEBUG(net, 0, "Too many GRF loaded. Max %d are allowed.\nExiting ...", NETWORK_MAX_GRF_COUNT);
ShutdownGame();
goto exit_normal;
}