From 51e06c054764971800694444b6cb35369a5ce336 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 15 Jun 2008 20:15:48 +0000 Subject: Fix the Vestibule having no upstairs. o_O Fix fleeing monsters shooting at you. (BR 1994462) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5861 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/notes.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/notes.cc') diff --git a/crawl-ref/source/notes.cc b/crawl-ref/source/notes.cc index 22638449f2..0930e3f000 100644 --- a/crawl-ref/source/notes.cc +++ b/crawl-ref/source/notes.cc @@ -192,6 +192,7 @@ static bool _is_noteworthy( const Note& note ) if (rnote.packed_place == note.packed_place) return (false); break; + case NOTE_LEARN_SPELL: if (spell_difficulty(static_cast(rnote.first)) >= spell_difficulty(static_cast(note.first))) @@ -199,10 +200,12 @@ static bool _is_noteworthy( const Note& note ) return (false); } break; + case NOTE_GOD_POWER: if (rnote.first == note.first && rnote.second == note.second) return (false); break; + case NOTE_HP_CHANGE: // Not if we have a recent warning // unless we've lost half our HP since then. @@ -212,6 +215,7 @@ static bool _is_noteworthy( const Note& note ) return (false); } break; + default: mpr("Buggy note passed: unknown note type"); // Return now, rather than give a "Buggy note passed" message @@ -419,7 +423,7 @@ void Note::load(reader& inf) type = static_cast(unmarshallLong( inf )); turn = unmarshallLong( inf ); packed_place = unmarshallShort( inf ); - first = unmarshallLong( inf ); + first = unmarshallLong( inf ); second = unmarshallLong( inf ); unmarshallString4( inf, name ); unmarshallString4( inf, desc ); -- cgit v1.2.3-54-g00ecf