The tutorial now uses set_more() to display the ability-menu help

(so Menu doesn't need to be aware of the tutorial.)
set_more() support with multi-line strings will only work if there are
enough free lines; it doesn't (yet) reduce pagesize. Also, it doesn't
handle newlines which aren't EOLs.


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

1 files changed, 10 insertions, 2 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 492d5cf247..70f215b7e2 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -62,6 +62,7 @@
 #include "spells4.h"
 #include "stuff.h"
 #include "transfor.h"
+#include "tutorial.h"
 #include "view.h"
 
 
@@ -1724,8 +1725,15 @@ int choose_ability_menu(const std::vector<talent>& talents)
         }
     }
 
-    bool tutorial = (Options.tutorial_left > 0);
-    std::vector<MenuEntry*> sel = abil_menu.show(false, tutorial);
+    if ( Options.tutorial_left )
+    {
+        // XXX This could be buggy if manage to pick up lots and lots
+        // of abilities during the tutorial.
+        abil_menu.set_more(tut_abilities_info());
+        abil_menu.set_flags(MF_SINGLESELECT | MF_ANYPRINTABLE |
+                            MF_ALWAYS_SHOW_MORE);
+    }
+    std::vector<MenuEntry*> sel = abil_menu.show(false);
     redraw_screen();
     if ( sel.empty() )
     {