summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/format.h
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2010-03-11 10:40:17 +0100
committerRobert Vollmert <rvollmert@gmx.net>2010-03-11 11:09:40 +0100
commitae14e36f579438fb335b1536b89290cd15690b0e (patch)
tree16556beac9a541432f15e9ba496c4b743cf2ff5f /crawl-ref/source/format.h
parent25d77ffbc1ef9aa55cf4c8f7424bb2746ebfeacd (diff)
downloadcrawl-ref-ae14e36f579438fb335b1536b89290cd15690b0e.tar.gz
crawl-ref-ae14e36f579438fb335b1536b89290cd15690b0e.zip
Replace formatted_string::parse_block by display_tagged_block.
The latter invokes parse_string_to_multiple and displays directly. This fixes line wrapping issues with full lines: on an 80 column terminal, an 80 character line could cause the cursor to wrap to the next line, causing extra blank lines due to the manual line feed in formatted_string::parse_block.
Diffstat (limited to 'crawl-ref/source/format.h')
-rw-r--r--crawl-ref/source/format.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/crawl-ref/source/format.h b/crawl-ref/source/format.h
index 51aeb4e109..5420c9cec1 100644
--- a/crawl-ref/source/format.h
+++ b/crawl-ref/source/format.h
@@ -62,11 +62,6 @@ public:
const std::string &s,
std::vector<formatted_string> &out);
- static formatted_string parse_block(
- const std::string &s,
- bool eot_ends_format = true,
- bool (*process_tag)(const std::string &tag) = NULL );
-
static int get_colour(const std::string &tag);
private:
@@ -117,5 +112,6 @@ int count_linebreaks(const formatted_string& fs);
int tagged_string_tag_length(const std::string& s);
int tagged_string_printable_length(const std::string& s);
std::string tagged_string_substr(const std::string& s, int start, int end);
+void display_tagged_block(const std::string& s);
#endif