diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-09 15:30:30 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-09 15:30:30 +0000 |
| commit | 1798905e716ab714da4ec70262532988b58356cd (patch) | |
| tree | 12e1fa445562b6840492ae4f6acabed0199f3ab5 /crawl-ref/source/notes.cc | |
| parent | 55826a15202764602ab3ad81cdeb3dd37ee9cb0b (diff) | |
| download | crawl-ref-1798905e716ab714da4ec70262532988b58356cd.tar.gz crawl-ref-1798905e716ab714da4ec70262532988b58356cd.zip | |
Added ice statues.
Monster spells now use spell_type instead of the old mon_spell_type.
Fixed buggy behaviour when banished from Labyrinth.
DGL_WHEREIS was not including current time, fixed.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1275 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/notes.cc')
| -rw-r--r-- | crawl-ref/source/notes.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/notes.cc b/crawl-ref/source/notes.cc index 425e00e719..fc02d9d0a1 100644 --- a/crawl-ref/source/notes.cc +++ b/crawl-ref/source/notes.cc @@ -162,8 +162,11 @@ static bool is_noteworthy( const Note& note ) return false; break; case NOTE_LEARN_SPELL: - if (spell_difficulty(rnote.first) >= spell_difficulty(note.first)) + if (spell_difficulty(static_cast<spell_type>(rnote.first)) >= + spell_difficulty(static_cast<spell_type>(note.first))) + { return false; + } break; case NOTE_GOD_POWER: if ( rnote.first == note.first && rnote.second == note.second ) @@ -253,7 +256,8 @@ std::string Note::describe( bool when, bool where, bool what ) const break; case NOTE_LEARN_SPELL: snprintf(buf, sizeof buf, "Learned a level %d spell: %s", - spell_difficulty(first), spell_title(first)); + spell_difficulty(static_cast<spell_type>(first)), + spell_title(static_cast<spell_type>(first))); break; case NOTE_GET_GOD: snprintf(buf, sizeof buf, "Became a worshipper of %s", |