diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-02 07:43:45 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-02 07:43:45 +0000 |
| commit | e9183b0754c65eccbb6edb43f73f8657763bcda7 (patch) | |
| tree | 1087c3ff2719be7d14c5c1da2a155e6445e6b32d /crawl-ref/source/notes.cc | |
| parent | d4eac8237d665f9126e74516281b97578fe45d3f (diff) | |
| download | crawl-ref-e9183b0754c65eccbb6edb43f73f8657763bcda7.tar.gz crawl-ref-e9183b0754c65eccbb6edb43f73f8657763bcda7.zip | |
1616158: Easy-butcher sequence if you are wearing gloves and can butcher
barehanded (effectively ghouls + those with MUT_CLAWS.)
The takeoff/puton armour messages will appear out of sequence, but this
is a bug in the delay process; you can see it now by taking off armour
while wearing a cloak. This could be fixed by having the delay start
message only trigger when the delay actually starts (as opposed to when
it's pushed onto the queue) but I'm not doing that because I'm not sure
where the code assumes the current behaviour.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1713 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/notes.cc')
| -rw-r--r-- | crawl-ref/source/notes.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/notes.cc b/crawl-ref/source/notes.cc index 9b6050c9d0..bf3ddd10c8 100644 --- a/crawl-ref/source/notes.cc +++ b/crawl-ref/source/notes.cc @@ -41,8 +41,7 @@ static int real_god_power( int religion, int idx ) static bool is_noteworthy_skill_level( int level ) { - unsigned i; - for ( i = 0; i < Options.note_skill_levels.size(); ++i ) + for ( unsigned int i = 0; i < Options.note_skill_levels.size(); ++i ) if ( level == Options.note_skill_levels[i] ) return true; return false; @@ -199,7 +198,7 @@ static bool is_noteworthy( const Note& note ) return true; } -const char* number_to_ordinal( int number ) +static const char* number_to_ordinal( int number ) { const char* ordinals[5] = { "first", "second", "third", "fourth", "fifth" }; @@ -440,6 +439,6 @@ void make_user_note() if ( !validline || (!*buf) ) return; Note unote(NOTE_USER_NOTE); - unote.name = std::string(buf); + unote.name = buf; take_note(unote); } |