Tiles again:

* Store index of last cell clicked on in inventory and suppress item
  description if you just clicked on it, so you can see the messages
  describing whatever you just did (should fix 2660578).
* Allow right-click as a synonym for '!' when toggling ^, A, m.
* Let shift left-click on avatar standing on altar = prayer.


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

1 files changed, 13 insertions, 6 deletions

diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc
index 3364cf334c..aacb6c817a 100644
--- a/crawl-ref/source/skills2.cc
+++ b/crawl-ref/source/skills2.cc
@@ -23,6 +23,7 @@ REVISION("$Rev$");
  #include <conio.h>
 #endif
 
+#include "cio.h"
 #include "describe.h"
 #include "externs.h"
 #include "fight.h"
@@ -1543,7 +1544,7 @@ const int spec_skills[ NUM_SPECIES ][40] =
     // SP_GREY_ELF placeholder.
     {
     },
-    
+
     // SP_GNOME placeholder.
     {
     }
@@ -1765,10 +1766,14 @@ static void _display_skill_table(bool show_aptitudes, bool show_description)
         if (_player_knows_aptitudes())
         {
             cgotoxy(1, bottom_line);
-            formatted_string::parse_string("Press '<w>!</w>' to toggle between "
-                                           "<cyan>progress</cyan> and "
-                                           "<red>aptitude</red> "
-                                           "display.").display();
+            formatted_string::parse_string(
+#ifndef USE_TILE
+                "Press '<w>!</w>'"
+#else
+                "<w>Right-click</w>"
+#endif
+                " to toggle between <cyan>progress</cyan> and "
+                "<red>aptitude</red> display.").display();
         }
     }
 }
@@ -1782,8 +1787,10 @@ void show_skills()
     {
         _display_skill_table(show_aptitudes, show_description);
 
+        mouse_control mc(MOUSE_MODE_MORE);
         const int keyin = getch();
-        if (keyin == '!' && _player_knows_aptitudes())
+        if ((keyin == '!' || keyin == CK_MOUSE_CMD)
+            && _player_knows_aptitudes())
         {
             show_aptitudes = !show_aptitudes;
             continue;