(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, 16 insertions, 10 deletions

diff --git a/string.h b/string.h
index eb928c519..781586515 100644
--- a/string.h
+++ b/string.h
@@ -29,19 +29,25 @@ char* CDECL str_fmt(const char* str, ...);
  * replaces them with a question mark '?' */
 void str_validate(char *str);
 
-/** Convert the given string to lowercase */
-void strtolower(char *str);
-
-typedef enum CharSetFilter {  //valid char filtering
-	CS_ALPHANUMERAL,   //both numeric and alphabetic
-	CS_NUMERAL,        //only numeric ones.
-	CS_ALPHA,          //only alphabetic values
+/**
+ * Valid filter types for IsValidAsciiChar.
+ */
+typedef enum CharSetFilter {
+	CS_ALPHANUMERAL,      //! Both numeric and alphabetic and spaces and stuff
+	CS_NUMERAL,           //! Only numeric ones
+	CS_ALPHA,             //! Only alphabetic values
 } CharSetFilter;
 
-/** Only allow valid ascii-function codes. Filter special codes like BELL and
- * so on [we need a special filter here later]
+/**
+ * Only allow certain keys. You can define the filter to be used. This makes
+ *  sure no invalid keys can get into an editbox, like BELL.
  * @param key character to be checked
- * @return true or false depending if the character is printable/valid or not */
+ * @param afilter the filter to use
+ * @return true or false depending if the character is printable/valid or not
+ */
 bool IsValidAsciiChar(byte key, CharSetFilter afilter);
 
+/** Convert the given string to lowercase */
+void strtolower(char *str);
+
 #endif /* STRING_H */