summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/notes.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-15 20:15:48 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-15 20:15:48 +0000
commit51e06c054764971800694444b6cb35369a5ce336 (patch)
tree80b9b9d51c04b749fbfc93660b58b10fcc34dd52 /crawl-ref/source/notes.cc
parentf5824a2c7390e30a801ac8b1eaa9cea7a6d3afae (diff)
downloadcrawl-ref-51e06c054764971800694444b6cb35369a5ce336.tar.gz
crawl-ref-51e06c054764971800694444b6cb35369a5ce336.zip
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
Diffstat (limited to 'crawl-ref/source/notes.cc')
-rw-r--r--crawl-ref/source/notes.cc6
1 files changed, 5 insertions, 1 deletions
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<spell_type>(rnote.first))
>= spell_difficulty(static_cast<spell_type>(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<NOTE_TYPES>(unmarshallLong( inf ));
turn = unmarshallLong( inf );
packed_place = unmarshallShort( inf );
- first = unmarshallLong( inf );
+ first = unmarshallLong( inf );
second = unmarshallLong( inf );
unmarshallString4( inf, name );
unmarshallString4( inf, desc );