Apply my recent commits to trunk.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9978 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 52 insertions, 22 deletions

diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index 09e91f7f99..d263188a88 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -92,9 +92,12 @@ The contents of this text are:
                 tile_mapped_wall_col, tile_door_col, tile_downstairs_col,
                 tile_upstairs_col, tile_feature_col, tile_trap_col,
                 tile_water_col, tile_lava_col, tile_excluded_col,
-                tile_excl_centre_col, tile_key_repeat, tile_tooltip_ms,
-                tile_window_width, tile_window_height, tile_map_pixels,
-                tile_full_screen, tile_tag_pref
+                tile_excl_centre_col, tile_key_repeat_delay, tile_tooltip_ms,
+                tile_tag_pref, tile_window_width, tile_window_height,
+                tile_map_pixels, tile_full_screen, tile_font_crt_file,
+                tile_font_stat_file, tile_font_msg_file, tile_font_tip_file,
+                tile_font_lbl_file, tile_font_crt_size, tile_font_stat_size,
+                tile_font_msg_size, tile_font_tip_size, tile_font_lbl_size
 5-  Character Dump.
 5-a     Items and Kills.
                 kill_map, dump_kill_places, dump_item_origins,
@@ -1232,6 +1235,8 @@ delay_message_clear = false
 show_inventory_weights = false
         When this is set to true, inventory listings will mention the
         weight of each item.
+        Note: This option doesn't currently work for Tiles unless you use
+              tile_menu_icons = false.
 
 show_gold_turns = false
         If set to true, this option adds an extra line to the stat area
@@ -1277,6 +1282,7 @@ mlist_allow_alternate_layout = false
         Display the monster list wherever Crawl may find space on
         your console display, usually to the left of the map, rather
         than using the fixed position below the stat area.
+        This option is not supported in the tiles build.
 
 mlist_targetting = false
         Using the monster list you can directly target monsters in
@@ -1631,34 +1637,58 @@ the dungeon level.
                            tile_floor_col and tile_item_col, only)
    tile_window_col       - colour of the rectangular view window
 
-tile_key_repeat = true
-         Whether or not to repeat key presses when they are held down.
-         By default, keys will repeat.
+tile_key_repeat_delay = 200
+        If you hold down a key, there's a delay until the pressed key will
+        take action. This option controls this delay, in milliseconds. If it
+        is set to 0 key presses will never repeat.
 
 tile_tooltip_ms = 500
-         The number of milliseconds before a tooltip appears when hovering the
-         mouse over part of the screen.
+        The number of milliseconds before a tooltip appears when hovering the
+        mouse over part of the screen. Setting this option to 0 will
+        deactivate the tooltips entirely.
+
+tile_tag_pref = (none| named | enemy | tutorial )
+        This option defaults to "enemy" normally and "tutorial" in tutorial
+        modes.  This setting determines which monsters receive text tag
+            none     - turns off all tags.
+            named    - shows names of all named monsters, ally or enemy
+            enemy    - shows names of named enemy monsters
+            tutorial - shows names of all monsters not yet killed this game
+                       and of named enemy monsters
+        Examples for named monsters are uniques and ghosts.
 
 tile_window_width  = 0
 tile_window_height = 0
-         The width and height of the window, in pixels.  If set to zero, it
-         will auto-size the window.
+        The width and height of the window, in pixels.  If set to zero, it
+        will auto-size the window.
 
 tile_map_pixels = 4
-         The number of pixels each minimap square should take up.
+        The number of pixels each minimap square should take up.
 
 tile_full_screen = false
-         Setting this option to true will start Crawl in full screen mode.
-
-tile_tag_pref = (none | tutorial | named | enemy)
-         This option defaults to "enemy" normally and "tutorial" in tutorial
-         modes.  This settings determines which monsters receive text tag
-         labels above them, describing what kind of monster they are.
-         The "none" option turns off all tags.  The "tutorial" option
-         shows the name of all monsters that the player has only killed
-         a few times.  The "named" options shows the names for all monsters
-         with names, friendly and enemy.  The "enemy" option only shows the
-         name of enemy monsters with names (such as uniques and ghosts.)
+        Setting this option to true will start Crawl in full screen mode.
+
+tile_font_crt_file  = VeraMono.ttf
+tile_font_stat_file = VeraMono.ttf
+tile_font_msg_file  = VeraMono.ttf
+tile_font_tip_file  = VeraMono.ttf
+tile_font_lbl_file  = Vera.ttf
+        Fonts used in various sections of the screen. If you want to use
+        another font, you'll have to place the corresponding *.ttf file into
+        the dat/tiles/ folder.
+        Screen regions are as follows:
+            crt  - non-map screens (menus, message history, etc.)
+            stat - stat area (hit points, AC, etc.)
+            msg  - message area
+            tip  - tooltips (mouseover information)
+            lbl  - item/monster names in inventory/main map
+
+tile_font_crt_size  = 15
+tile_font_stat_size = 16
+tile_font_msg_size  = 14
+tile_font_tip_size  = 15
+tile_font_lbl_size  = 14
+        Font size for the screen regions listed above.
 
 5-  Character Dump.
 ===================