diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-06 09:29:24 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-06 09:29:24 +0000 |
| commit | 1a3922fd4a76605598293aff58591a77f37c0bb1 (patch) | |
| tree | 965c54dc6423154ff382c729809ad60ddbb27078 /crawl-ref/source/mutation.cc | |
| parent | cd3044ce7a7ad2f693ee52a4b3b194de34d36d9e (diff) | |
| download | crawl-ref-1a3922fd4a76605598293aff58591a77f37c0bb1.tar.gz crawl-ref-1a3922fd4a76605598293aff58591a77f37c0bb1.zip | |
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
Diffstat (limited to 'crawl-ref/source/mutation.cc')
| -rw-r--r-- | crawl-ref/source/mutation.cc | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index d0dc286ae2..1748f8f0aa 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -26,6 +26,7 @@ REVISION("$Rev$"); #include "externs.h" +#include "cio.h" #include "defines.h" #include "effects.h" #include "format.h" @@ -1547,8 +1548,14 @@ formatted_string describe_mutations() { result += EOL EOL; result += EOL EOL; - result += "Press '<w>!</w>' to toggle between mutations and " - "properties depending on your" EOL "hunger status." EOL; + result += +#ifndef USE_TILE + "Press '<w>!</w>'" +#else + "<w>Right-click</w>" +#endif + " to toggle between mutations and properties depending on your" EOL + "hunger status." EOL; } return formatted_string::parse_string(result); @@ -1637,16 +1644,23 @@ static void _display_vampire_attributes() } result += EOL; - result += "Press '<w>!</w>' to toggle between mutations and properties depending on your " EOL - "hunger status." EOL; + result += +#ifndef USE_TILE + "Press '<w>!</w>'" +#else + "<w>Right-click</w>" +#endif + " to toggle between mutations and properties depending on your" EOL + "hunger status." EOL; const formatted_string vp_props = formatted_string::parse_string(result); vp_props.display(); if (you.species == SP_VAMPIRE) { + mouse_control mc(MOUSE_MODE_MORE); const int keyin = getch(); - if (keyin == '!') + if (keyin == '!' || keyin == CK_MOUSE_CMD) display_mutations(); } } @@ -1661,8 +1675,9 @@ void display_mutations() if (you.species == SP_VAMPIRE) { mutation_fs.display(); + mouse_control mc(MOUSE_MODE_MORE); const int keyin = getch(); - if (keyin == '!') + if (keyin == '!' || keyin == CK_MOUSE_CMD) _display_vampire_attributes(); } else |