Changed around the help screen a bit, following David's ideas.

Appendix hotkeys now work.


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

1 files changed, 6 insertions, 2 deletions

diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc
index 4531e35766..8b312c7878 100644
--- a/crawl-ref/source/menu.cc
+++ b/crawl-ref/source/menu.cc
@@ -1175,7 +1175,7 @@ bool formatted_scroller::page_down()
     int target;
     for (target = first_entry; target < first_entry + pagesize; ++target )
     {
-        const int offset = target + pagesize - 1;
+        const int offset = target + pagesize;
         if (offset < (int)items.size() && items[offset]->level == MEL_TITLE)
             break;
     }
@@ -1191,6 +1191,8 @@ bool formatted_scroller::page_up()
     // somewhere in the newly displayed page, stop scrolling
     // just before it becomes visible
 
+    if ( items[first_entry]->level == MEL_TITLE )
+        return false;
 
     for ( int i = 0; i < pagesize; ++i )
     {
@@ -1198,6 +1200,7 @@ bool formatted_scroller::page_up()
             break;
         --first_entry;
     }
+
     return (old_first != first_entry);
 }
 
@@ -1214,7 +1217,8 @@ bool formatted_scroller::line_down()
 
 bool formatted_scroller::line_up()
 {
-    if (first_entry > 0 && items[first_entry-1]->level != MEL_TITLE)
+    if (first_entry > 0 && items[first_entry-1]->level != MEL_TITLE &&
+        items[first_entry]->level != MEL_TITLE)
     {
         --first_entry;
         return true;