summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/command.cc10
-rw-r--r--crawl-ref/source/view.cc3
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