diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-06 17:46:04 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-06 17:46:04 +0000 |
| commit | a13cac4c736e7823fbdc8ec63c80171b4dd8368e (patch) | |
| tree | 48bfc8bbf2484d7af0ef511a5e2985516e786736 /crawl-ref/source | |
| parent | 71ae844db21dfb4f54e6addfa812353b1f1332ca (diff) | |
| download | crawl-ref-a13cac4c736e7823fbdc8ec63c80171b4dd8368e.tar.gz crawl-ref-a13cac4c736e7823fbdc8ec63c80171b4dd8368e.zip | |
Removed targeting and level-map help from the main help screen since they're
available elsewhere.
[1731478] Fixed game crashing when saving a screenshot (broken during the
viewport changes).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1549 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/command.cc | 10 | ||||
| -rw-r--r-- | crawl-ref/source/view.cc | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index bb2d523ba8..1101d4362c 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -889,11 +889,6 @@ void list_commands(bool wizard, int hotkey) cols.add_formatted( 0, - level_map_help, - true, true, cmdhelp_textfilter); - - cols.add_formatted( - 0, "<h>Item types (and common commands)\n" "<cyan>)</cyan> : hand weapons (<w>w</w>ield)\n" "<brown>(</brown> : missiles (<w>t</w>hrow or <w>f</w>ire)\n" @@ -992,11 +987,6 @@ void list_commands(bool wizard, int hotkey) " \n", true, true, cmdhelp_textfilter); - cols.add_formatted( - 1, - targeting_help, - true, true, cmdhelp_textfilter); - cols.add_formatted( 1, "<h>Shortcuts in Lists (like multidrop):\n" diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 379c75a591..13679f290a 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -3610,7 +3610,8 @@ std::string screenshot( bool fullscreen ) lines[count_y - 1] += ch; } - lines[count_y - 1].erase(lastnonspace + 1); + if (lastnonspace < (int) lines[count_y - 1].length()) + lines[count_y - 1].erase(lastnonspace + 1); } // Restore char and feature tables |