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

diff --git a/fios.h b/fios.h
index 5b29c40b6..882490bc4 100644
--- a/fios.h
+++ b/fios.h
@@ -20,6 +20,8 @@ enum {
 	FIOS_TYPE_SCENARIO = 5,
 	FIOS_TYPE_OLD_SCENARIO = 6,
 	FIOS_TYPE_DIRECT = 7,
+	FIOS_TYPE_PNG = 8,
+	FIOS_TYPE_BMP = 9,
 	FIOS_TYPE_INVALID = 255,
 };
 
@@ -32,6 +34,8 @@ extern int _saveload_mode;   // defined in misc_gui.c
 FiosItem *FiosGetSavegameList(int mode);
 // Get a list of scenarios
 FiosItem *FiosGetScenarioList(int mode);
+// Get a list of Heightmaps
+FiosItem *FiosGetHeightmapList(int mode);
 // Free the list of savegames
 void FiosFreeSavegameList(void);
 // Browse to. Returns a filename w/path if we reached a file.