(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:

  - New optional landscape generator (TerraGenesis Perlin)
  - Load heightmaps (either BMP or PNG)
  - Progress dialog while generating worlds (no longer a 'hanging' screen)
  - New dialogs for NewGame, Create Scenario and Play Heightmap
    - Easier to configure your landscape
    - More things to configure (tree-placer, ..)
  - Speedup of world generation
  - New console command 'restart': restart the map EXACTLY as it was when you
      first started it (needs a game made after or with this commit)
  - New console command 'getseed': get the seed of your map and share it with
      others (of course only works with generated maps)
  - Many new, world generation related, things
  - Many internal cleanups and rewrites
  Many tnx to those people who helped making this:
     Belugas, DaleStan, glx, KUDr, RichK67, Rubidium, and TrueLight (alfabetic)
  Many tnx to those who helped testing:
     Arnau, Bjarni, and tokai (alfabetic)
  And to all other people who helped testing and sending comments / bugs
  Stats: 673 lines changed, 3534 new lines, 79 new strings

1 files changed, 2 insertions, 6 deletions

diff --git a/network_server.c b/network_server.c
index 1144840dd..9a3c64930 100644
--- a/network_server.c
+++ b/network_server.c
@@ -21,6 +21,7 @@
 #include "vehicle.h"
 #include "station.h"
 #include "variables.h"
+#include "genworld.h"
 
 // This file handles all the server-commands
 
@@ -1308,18 +1309,13 @@ void NetworkUpdateClientInfo(uint16 client_index)
 	}
 }
 
-extern void SwitchMode(int new_mode);
-
 /* Check if we want to restart the map */
 static void NetworkCheckRestartMap(void)
 {
 	if (_network_restart_game_year != 0 && _cur_year >= _network_restart_game_year) {
 		DEBUG(net, 0)("Auto-restarting map. Year %d reached.", _cur_year);
 
-		_random_seeds[0][0] = Random();
-		_random_seeds[0][1] = InteractiveRandom();
-
-		SwitchMode(SM_NEWGAME);
+		StartNewGameWithoutGUI(GENERATE_NEW_SEED);
 	}
 }