File diff r4292:340dc5050536 → r4293:cbb984a32af5
openttd.c
Show inline comments
 
@@ -313,13 +313,13 @@ int ttd_main(int argc, char *argv[])
 
{
 
	MyGetOptData mgo;
 
	int i;
 
	const char *optformat;
 
	char musicdriver[16], sounddriver[16], videodriver[16];
 
	int resolution[2] = {0,0};
 
	uint startyear = -1;
 
	Year startyear = INVALID_YEAR;
 

	
 
	bool dedicated = false;
 
	bool network   = false;
 
	char *network_conn = NULL;
 

	
 
	musicdriver[0] = sounddriver[0] = videodriver[0] = 0;
 
@@ -405,13 +405,13 @@ int ttd_main(int argc, char *argv[])
 

	
 
	// override config?
 
	if (musicdriver[0]) ttd_strlcpy(_ini_musicdriver, musicdriver, sizeof(_ini_musicdriver));
 
	if (sounddriver[0]) ttd_strlcpy(_ini_sounddriver, sounddriver, sizeof(_ini_sounddriver));
 
	if (videodriver[0]) ttd_strlcpy(_ini_videodriver, videodriver, sizeof(_ini_videodriver));
 
	if (resolution[0]) { _cur_resolution[0] = resolution[0]; _cur_resolution[1] = resolution[1]; }
 
	if (startyear != (uint)-1) _patches_newgame.starting_year = startyear;
 
	if (startyear != INVALID_YEAR) _patches_newgame.starting_year = startyear;
 

	
 
	if (_dedicated_forks && !dedicated) _dedicated_forks = false;
 

	
 
	// enumerate language files
 
	InitializeLanguagePacks();