openttd-mini: comparison openttd.c

equal deleted inserted replaced

-:91f5d2bedcff
+:c7e43c47a2b9
 #include "waypoint.h"
 #include "ai/ai.h"
 #include "train.h"
 #include "yapf/yapf.h"
 #include "settings.h"
+#include "genworld.h"
 #include "date.h"
 #include <stdarg.h>
-void GenerateWorld(int mode, uint size_x, uint size_y);
 void CallLandscapeTick(void);
 void IncreaseDate(void);
 void DoPaletteAnimations(void);
 void MusicLoop(void);
 void ResetMusic(void);
 		sprintf(filename, "%sopntitle.dat",  _path.second_data_dir);
 	}
 #endif
 	if (SaveOrLoad(filename, SL_LOAD) != SL_OK) {
 		GenerateWorld(GW_EMPTY, 64, 64); // if failed loading, make empty world.
+		WaitTillGeneratedWorld();
 	}
 	_pause = 0;
 	_local_player = 0;
 	MarkWholeScreenDirty();
 	int i;
 	const char *optformat;
 	char musicdriver[16], sounddriver[16], videodriver[16];
 	int resolution[2] = {0,0};
 	Year startyear = INVALID_YEAR;
+	uint generation_seed = GENERATE_NEW_SEED;
 	bool dedicated = false;
 	bool network   = false;
 	char *network_conn = NULL;
 	musicdriver[0] = sounddriver[0] = videodriver[0] = 0;
 				_switch_mode = SM_LOAD;
 			} else {
 				_switch_mode = SM_NEWGAME;
 			}
 			break;
-		case 'G': _random_seeds[0][0] = atoi(mgo.opt); break;
+		case 'G': generation_seed = atoi(mgo.opt); break;
 		case 'c': _config_file = strdup(mgo.opt); break;
 		case -2:
 		case 'h':
 			showhelp();
 			return 0;
 	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 != INVALID_YEAR) _patches_newgame.starting_year = startyear;
+	if (generation_seed != GENERATE_NEW_SEED) _patches_newgame.generation_seed = generation_seed;
 	if (_dedicated_forks && !dedicated) _dedicated_forks = false;
 	// enumerate language files
 	InitializeLanguagePacks();
 	_opt_ptr = &_opt_newgame;
 	/* XXX - ugly hack, if diff_level is 9, it means we got no setting from the config file */
 	if (_opt_newgame.diff_level == 9) SetDifficultyLevel(0, &_opt_newgame);
+	/* Make sure _patches is filled with _patches_newgame if we switch to a game directly */
+	if (_switch_mode != SM_NONE) {
+		memcpy(&_opt, &_opt_newgame, sizeof(_opt));
+		GfxLoadSprites();
+		UpdatePatches();
+	}
 	// initialize the ingame console
 	IConsoleInit();
 	_cursor.in_window = true;
 	InitializeGUI();
 	IConsoleCmdExec("exec scripts/autoexec.scr 0");
 	GenerateWorld(GW_EMPTY, 64, 64); // Make the viewport initialization happy
+	WaitTillGeneratedWorld();
 #ifdef ENABLE_NETWORK
 	if (network && _network_available) {
 		if (network_conn != NULL) {
 			const char *port = NULL;
 		ShowErrorMessage(INVALID_STRING_ID, STR_031C_SCREENSHOT_FAILED, 0, 0);
 	}
 }
-static void MakeNewGame(void)
+static void MakeNewGameDone(void)
 {
-	_game_mode = GM_NORMAL;
+	/* In a dedicated server, the server does not play */
-	// Copy in game options
-	_opt_ptr = &_opt;
-	memcpy(_opt_ptr, &_opt_newgame, sizeof(*_opt_ptr));
-	GfxLoadSprites();
-	// Reinitialize windows
-	ResetWindowSystem();
-	LoadStringWidthTable();
-	SetupColorsAndInitialWindow();
-	// Randomize world
-	GenerateWorld(GW_NEWGAME, 1<<_patches.map_x, 1<<_patches.map_y);
-	// In a dedicated server, the server does not play
 	if (_network_dedicated) {
 		_local_player = OWNER_SPECTATOR;
-	} else {
+		return;
-		// Create a single player
+	}
-		DoStartupNewPlayer(false);
+	/* Create a single player */
-		_local_player = 0;
+	DoStartupNewPlayer(false);
-		_current_player = _local_player;
-		DoCommandP(0, (_patches.autorenew << 15 ) | (_patches.autorenew_months << 16) | 4, _patches.autorenew_money, NULL, CMD_REPLACE_VEHICLE);
+	_local_player = 0;
-	}
+	_current_player = _local_player;
+	DoCommandP(0, (_patches.autorenew << 15 ) | (_patches.autorenew_months << 16) | 4, _patches.autorenew_money, NULL, CMD_REPLACE_VEHICLE);
 	MarkWholeScreenDirty();
 }
+static void MakeNewGame(bool from_heightmap)
+{
+	_game_mode = GM_NORMAL;
+	GenerateWorldSetCallback(&MakeNewGameDone);
+	GenerateWorld(from_heightmap ? GW_HEIGHTMAP : GW_NEWGAME, 1 << _patches.map_x, 1 << _patches.map_y);
+}
+static void MakeNewEditorWorldDone(void)
+{
+	_local_player = OWNER_NONE;
+	MarkWholeScreenDirty();
+}
 static void MakeNewEditorWorld(void)
 {
 	_game_mode = GM_EDITOR;
-	// Copy in game options
+	GenerateWorldSetCallback(&MakeNewEditorWorldDone);
-	_opt_ptr = &_opt;
-	memcpy(_opt_ptr, &_opt_newgame, sizeof(GameOptions));
-	GfxLoadSprites();
-	// Re-init the windowing system
-	ResetWindowSystem();
-	// Create toolbars
-	SetupColorsAndInitialWindow();
-	// Startup the game system
 	GenerateWorld(GW_EMPTY, 1 << _patches.map_x, 1 << _patches.map_y);
-	_local_player = OWNER_NONE;
-	MarkWholeScreenDirty();
 }
 void StartupPlayers(void);
 void StartupDisasters(void);
 extern void StartupEconomy(void);
 		case SL_REINIT:
 			switch (ogm) {
 				case GM_MENU:   LoadIntroGame();      break;
 				case GM_EDITOR: MakeNewEditorWorld(); break;
-				default:        MakeNewGame();        break;
+				default:        MakeNewGame(false);   break;
 			}
 			return false;
 		default:
 			_game_mode = ogm;
 #ifdef ENABLE_NETWORK
 		if (_network_server) {
 			snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "Random Map");
 		}
 #endif /* ENABLE_NETWORK */
-		MakeNewGame();
+		MakeNewGame(false);
 		break;
 	case SM_START_SCENARIO: /* New Game --> Choose one of the preset scenarios */
 #ifdef ENABLE_NETWORK
 		if (_network_server) {
 #endif /* ENABLE_NETWORK */
 		}
 		break;
 	}
+	case SM_START_HEIGHTMAP: /* Load a heightmap and start a new game from it */
+#ifdef ENABLE_NETWORK
+		if (_network_server) {
+			snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "%s (Heightmap)", _file_to_saveload.title);
+		}
+#endif /* ENABLE_NETWORK */
+		MakeNewGame(true);
+		break;
+	case SM_LOAD_HEIGHTMAP: /* Load heightmap from scenario editor */
+		_local_player = OWNER_NONE;
+		GenerateWorld(GW_HEIGHTMAP, 1 << _patches.map_x, 1 << _patches.map_y);
+		MarkWholeScreenDirty();
+		break;
 	case SM_LOAD_SCENARIO: { /* Load scenario from scenario editor */
 		if (SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_EDITOR)) {
 			Player *p;
 			_opt_ptr = &_opt;
 					ChangeOwnershipOfPlayerItems(p->index, OWNER_SPECTATOR);
 					p->is_active = false;
 				}
 			}
 			_generating_world = false;
+			_patches_newgame.starting_year = BASE_YEAR + _cur_year;
 			// delete all stations owned by a player
 			DeleteAllPlayerStations();
 		} else {
 			ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0);
 		}
 			DeleteWindowById(WC_SAVELOAD, 0);
 		}
 		break;
 	case SM_GENRANDLAND: /* Generate random land within scenario editor */
+		_local_player = OWNER_NONE;
 		GenerateWorld(GW_RANDOM, 1 << _patches.map_x, 1 << _patches.map_y);
 		// XXX: set date
-		_local_player = OWNER_NONE;
 		MarkWholeScreenDirty();
 		break;
 	}
 	if (_switch_mode_errorstr != INVALID_STRING_ID) {
 // That check is enforced in DoCommand.
 void StateGameLoop(void)
 {
 	// dont execute the state loop during pause
 	if (_pause) return;
+	if (IsGeneratingWorld()) return;
 	if (_game_mode == GM_EDITOR) {
 		RunTileLoop();
 		CallVehicleTicks();
 		CallLandscapeTick();
 		ShowErrorMessage(INVALID_STRING_ID, STR_AUTOSAVE_FAILED, 0, 0);
 }
 static void ScrollMainViewport(int x, int y)
 {
-	if (_game_mode != GM_MENU) {
+	if (_game_mode != GM_MENU && !IsGeneratingWorld()) {
 		Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
 		assert(w);
 		WP(w,vp_d).scrollpos_x += x << w->viewport->zoom;
 		WP(w,vp_d).scrollpos_y += y << w->viewport->zoom;
 #ifdef ENABLE_NETWORK
 	// Check for UDP stuff
 	if (_network_available)
 		NetworkUDPGameLoop();
-	if (_networking) {
+	if (_networking && !IsGeneratingWorld()) {
 		// Multiplayer
 		NetworkGameLoop();
 	} else {
 		if (_network_reconnect > 0 && --_network_reconnect == 0) {
 			// This means that we want to reconnect to the last host

changeset 4300	c7e43c47a2b9
parent 4293	4b7006c1b5eb
child 4323	ae32c5fab67b