(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, 9 insertions, 0 deletions

diff --git a/variables.h b/variables.h
index d90be7709..3fd9488f9 100644
--- a/variables.h
+++ b/variables.h
@@ -107,7 +107,15 @@ typedef struct Patches {
 	bool roadveh_queue;			// buggy road vehicle queueing
 	bool autoscroll;				// scroll when moving mouse to the edge.
 	byte errmsg_duration;		// duration of error message
+	byte land_generator;		// the landscape generator
+	byte oil_refinery_limit;	// distance oil refineries allowed from map edge
 	byte snow_line_height;	// a number 0-15 that configured snow line height
+	byte tgen_smoothness;		// how rough is the terrain from 0-3
+	uint32 generation_seed;	// noise seed for world generation
+	byte tree_placer;				// the tree placer algorithm
+	byte heightmap_rotation;// rotation director for the heightmap
+	uint16 progress_update_interval;// interval between two updates of the progress in hundreds of milliseconds
+	byte se_flat_world_height;	// land height a flat world gets in SE
 	bool bribe;							// enable bribing the local authority
 	bool nonuniform_stations;// allow nonuniform train stations
 	bool always_small_airport; // always allow small airports
@@ -244,6 +252,7 @@ typedef struct Paths {
 	char *save_dir;
 	char *autosave_dir;
 	char *scenario_dir;
+	char *heightmap_dir;
 	char *second_data_dir;
 } Paths;