diff options
author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-18 17:03:18 +0000 |
---|---|---|
committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-18 17:03:18 +0000 |
commit | 3275e9d0f89f2860f5e9dfd3ca2bf20e2d89d91a (patch) | |
tree | 3394cac318e3423e16ff3c8e686c17dfbfcdeb9d /crawl-ref | |
parent | 40e6cec1c6f46027dc07110dde8b14248f728d05 (diff) | |
download | crawl-ref-3275e9d0f89f2860f5e9dfd3ca2bf20e2d89d91a.tar.gz crawl-ref-3275e9d0f89f2860f5e9dfd3ca2bf20e2d89d91a.zip |
[2735312] Don't squelch multiple EOLs in the same cprintf for tiles. This should remove the inconsistency between tiles and console text printing.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9628 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/decks.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/tilereg.cc | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 76dec12063..b47442fe65 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -935,10 +935,6 @@ static void _describe_cards(std::vector<card_type> cards) name = uppercase_first(name); data << "<w>" << name << "</w>\n" << get_linebreak_string(desc, get_number_of_cols()) -#ifdef USE_TILE - // For some reason we need another linebreak here, for the tiles version. - << EOL -#endif << EOL; } formatted_string fs = formatted_string::parse_string(data.str()); diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index e4173944f1..73992978f1 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -2172,12 +2172,14 @@ void TextRegion::addstr(char *buffer) { char c = buffer[i]; bool newline = false; - if (c == '\n' || c == '\r') + + if (c == '\r') + continue; + + if (c == '\n') { c = 0; newline = true; - if (buffer[i+1] == '\n' || buffer[i+1] == '\r') - i++; } buf2[j] = c; j++; |