From c0c613a08e2c4353475b6dd14f5aa934b364a38d Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 2 Jun 2008 21:46:56 +0000 Subject: Fix a recent bug of mine that blocked the friendly fire prompts. Fix 1943573: Weird message order when attacking charmed monsters. Fix 1826896: NOTE_ID could have line breaks in mid-word Modify the "This feature has more information" hint to mention mouseclicking for Tiles players rather than 'v' like for purists. Oh, and when trying to look into BR 1952908 (buggy trap in the Abyss) I found that traps can be generated in the Abyss after all. I don't know when that was changed but the last time I checked I remember seeing something like "if (level == ABYSS) return false" in a "Can there be traps here?" check. Is my memory playing tricks on me or was that really changed, and if so, was it intentional? git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5445 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/chardump.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/chardump.cc') diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc index 22198eef94..fd54f88a5b 100644 --- a/crawl-ref/source/chardump.cc +++ b/crawl-ref/source/chardump.cc @@ -1240,13 +1240,15 @@ void display_notes() if (spaceleft <= 0) return; - linebreak_string(suffix, spaceleft - 4, spaceleft); + // Use smarter linebreak function. + // was: linebreak_string(suffix, spaceleft - 4, spaceleft); + linebreak_string2(suffix, spaceleft); std::vector parts = split_string("\n", suffix); - if (parts.empty()) // disregard pure-whitespace notes + if (parts.empty()) // Disregard pure-whitespace notes. continue; scr.add_entry(new MenuEntry(prefix + parts[0])); - for ( unsigned int j = 1; j < parts.size(); ++j ) + for (unsigned int j = 1; j < parts.size(); ++j) { scr.add_entry(new MenuEntry(std::string(prefix.length()-2, ' ') + std::string("| ") + parts[j])); -- cgit v1.2.3-54-g00ecf