diff -r 5a8b295aa345 -r 4cc327ad39d5 src/genworld.cpp --- a/src/genworld.cpp Tue Mar 27 23:27:27 2007 +0000 +++ b/src/genworld.cpp Sat Jun 02 19:59:29 2007 +0000 @@ -5,10 +5,12 @@ #include "stdafx.h" #include "openttd.h" #include "functions.h" +#include "landscape.h" #include "player.h" #include "table/sprites.h" #include "variables.h" #include "thread.h" +#include "command.h" #include "genworld.h" #include "gfx.h" #include "gfxinit.h" @@ -19,7 +21,6 @@ #include "heightmap.h" #include "date.h" -void GenerateLandscape(byte mode); void GenerateClearTile(); void GenerateIndustries(); void GenerateUnmovables(); @@ -32,8 +33,6 @@ void InitializeGame(int mode, uint size_x, uint size_y); -void ConvertGroundTilesIntoWaterTiles(); - /* Please only use this variable in genworld.h and genworld.c and * nowhere else. For speed improvements we need it to be global, but * in no way the meaning of it is to use it anywhere else besides @@ -155,6 +154,8 @@ if (_network_dedicated) DEBUG(net, 0, "Map generated, starting game"); + if (_patches.pause_on_newgame && _game_mode == GM_NORMAL) DoCommandP(0, 1, 0, NULL, CMD_PAUSE); + return NULL; } @@ -289,6 +290,6 @@ /* Centre the view on the map */ if (FindWindowById(WC_MAIN_WINDOW, 0) != NULL) { - ScrollMainWindowToTile(TileXY(MapSizeX() / 2, MapSizeY() / 2)); + ScrollMainWindowToTile(TileXY(MapSizeX() / 2, MapSizeY() / 2), true); } }