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

1 files changed, 2 insertions, 2 deletions

diff --git a/crawl-ref/source/notes.cc b/crawl-ref/source/notes.cc
index 9191fbb7ae..40bee46258 100644
--- a/crawl-ref/source/notes.cc
+++ b/crawl-ref/source/notes.cc
@@ -449,7 +449,7 @@ void save_notes(writer& outf)
 {
     marshallLong( outf, NOTES_VERSION_NUMBER );
     marshallLong( outf, note_list.size() );
-    for ( unsigned i = 0; i < note_list.size(); ++i )
+    for (unsigned i = 0; i < note_list.size(); ++i)
         note_list[i].save(outf);
 }
 
@@ -472,7 +472,7 @@ void make_user_note()
     mpr("Enter note: ", MSGCH_PROMPT);
     char buf[400];
     bool validline = !cancelable_get_line(buf, sizeof(buf));
-    if ( !validline || (!*buf) )
+    if (!validline || (!*buf))
         return;
     Note unote(NOTE_USER_NOTE);
     unote.name = buf;