Apply my recent commits to trunk.

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

1 files changed, 15 insertions, 5 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index b0e05d51fd..f7364fa457 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -286,6 +286,8 @@ int main( int argc, char *argv[] )
     while (true)
         _input();
 
+    clear_globals_on_exit();
+
     return 0;
 }
 
@@ -1005,12 +1007,13 @@ static void _input()
         c_input_reset(true);
 
         _center_cursor();
-        // Enable the cursor to read input. The cursor stays on while
-        // the command is being processed, so subsidiary prompts
-        // shouldn't need to turn it on explicitly.
+
 #ifdef USE_TILE
         cursor_control con(false);
 #else
+        // Enable the cursor to read input. The cursor stays on while
+        // the command is being processed, so subsidiary prompts
+        // shouldn't need to turn it on explicitly.
         cursor_control con(true);
 #endif
         const command_type cmd = _get_next_cmd();
@@ -2535,8 +2538,11 @@ void world_reacts()
     }
 
 #ifdef USE_TILE
-    tiles.clear_text_tags(TAG_TUTORIAL);
-    tiles.place_cursor(CURSOR_TUTORIAL, Region::NO_CURSOR);
+    if (Options.tutorial_left)
+    {
+        tiles.clear_text_tags(TAG_TUTORIAL);
+        tiles.place_cursor(CURSOR_TUTORIAL, Region::NO_CURSOR);
+    }
 #endif
 
     if (you.num_turns != -1)
@@ -3425,6 +3431,10 @@ static bool _initialise(void)
 #endif
 
 #ifdef USE_TILE
+    // Override inventory weights options for tiled menus.
+    if (Options.tile_menu_icons && Options.show_inventory_weights)
+        Options.show_inventory_weights = false;
+
     tiles.resize();
 #endif