diff options
Diffstat (limited to 'crawl-ref/source/menu.cc')
| -rw-r--r-- | crawl-ref/source/menu.cc | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index 175e098c12..c452cf7973 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -1203,7 +1203,8 @@ void slider_menu::calc_y_offset() int slider_menu::entry_end() const { int end = first_entry + pagesize; - if (end > (int) items.size()) end = items.size(); + if (end > (int) items.size()) + end = items.size(); return (end); } @@ -1400,13 +1401,12 @@ void column_composer::clear() flines.clear(); } -void column_composer::add_formatted( - int ncol, - const std::string &s, - bool add_separator, - bool eol_ends_format, - bool (*tfilt)(const std::string &), - int margin) +void column_composer::add_formatted(int ncol, + const std::string &s, + bool add_separator, + bool eol_ends_format, + bool (*tfilt)(const std::string &), + int margin) { ASSERT(ncol >= 0 && ncol < (int) columns.size()); @@ -1433,10 +1433,9 @@ void column_composer::add_formatted( strip_blank_lines(newlines); - compose_formatted_column( - newlines, - col.lines, - margin == -1? col.margin : margin); + compose_formatted_column( newlines, + col.lines, + margin == -1? col.margin : margin ); col.lines += newlines.size(); |