summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/menu.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-23 21:08:10 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-23 21:08:10 +0000
commit2bcedfdf3c59078e54d15d03b3a9473ed4bdd44b (patch)
treeba54660d8b3ecaa06b113aa13c9f4c104a9d0fd1 /crawl-ref/source/menu.cc
parentc38a52f9377b9f87e66cdccfeab2abbaa72faad8 (diff)
downloadcrawl-ref-2bcedfdf3c59078e54d15d03b3a9473ed4bdd44b.tar.gz
crawl-ref-2bcedfdf3c59078e54d15d03b3a9473ed4bdd44b.zip
* Allow viewing of card descriptions from Triple Draw and Stack Deck.
* Sort items in 'V' screen according to pickup menu sort order. * Name Xom's randart book gifts more randomly. * Colour items seen by 'x' with message colour tags and same for pickup messages. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9541 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/menu.cc')
-rw-r--r--crawl-ref/source/menu.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc
index 8f2e2e822b..175e098c12 100644
--- a/crawl-ref/source/menu.cc
+++ b/crawl-ref/source/menu.cc
@@ -1418,7 +1418,9 @@ void column_composer::add_formatted(
// be added at page boundaries.
if (add_separator && col.lines && !segs.empty()
&& (!pagesize || col.lines % pagesize))
+ {
newlines.push_back(formatted_string());
+ }
for (unsigned i = 0, size = segs.size(); i < size; ++i)
{
@@ -1747,8 +1749,8 @@ bool formatted_scroller::page_up()
bool formatted_scroller::line_down()
{
- if (first_entry + pagesize < static_cast<int>(items.size()) &&
- items[first_entry + pagesize]->level != MEL_TITLE )
+ if (first_entry + pagesize < static_cast<int>(items.size())
+ && items[first_entry + pagesize]->level != MEL_TITLE)
{
++first_entry;
return (true);