diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-19 16:30:10 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-19 16:30:10 +0000 |
| commit | 0c4a63b2f485fd6203325c0cc61ca8fdcddc288d (patch) | |
| tree | 224d1a81f06850788c3cf91901a475ffd74a464a | |
| parent | 45b0ff6c34bfa8f1653413349a31a65070e662c6 (diff) | |
| download | crawl-ref-0c4a63b2f485fd6203325c0cc61ca8fdcddc288d.tar.gz crawl-ref-0c4a63b2f485fd6203325c0cc61ca8fdcddc288d.zip | |
1815768: some NOTE_USER_NOTEs should be NOTE_MESSAGE instead (actually
they should be yet another note type, but NOTE_MESSAGE works for now.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2490 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/acr.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/effects.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index fa477bac6d..882287d83d 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -344,7 +344,7 @@ int main( int argc, char *argv[] ) << species_name(you.species,you.experience_level) << " " << you.class_name << ", began the quest for the Orb."; - take_note(Note(NOTE_USER_NOTE, 0, 0, notestr.str().c_str())); + take_note(Note(NOTE_MESSAGE, 0, 0, notestr.str().c_str())); notestr.str(""); notestr.clear(); diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index a4db2907b5..8cf3b45865 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -270,7 +270,7 @@ void banished(dungeon_feature_type gate_type, const std::string &who) if (cast_into != "" && you.entry_cause != EC_SELF_EXPLICIT) { const std::string what = "Cast into " + cast_into + who_banished(who); - take_note(Note(NOTE_USER_NOTE, 0, 0, what.c_str()), true); + take_note(Note(NOTE_MESSAGE, 0, 0, what.c_str()), true); } down_stairs(you.your_level, gate_type, you.entry_cause); // heh heh diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index aadcc09d43..0cecea466f 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -888,7 +888,6 @@ int items( int allow_uniques, // not just true-false, int quant = 0; - int icky = 0; int p = 0; // find an empty slot for the item (with culling if required) @@ -1010,7 +1009,7 @@ int items( int allow_uniques, // not just true-false, && you.level_type != LEVEL_PANDEMONIUM && one_chance_in(50)) { - icky = find_okay_unrandart( OBJ_WEAPONS, force_type ); + const int icky=find_okay_unrandart(OBJ_WEAPONS,force_type); if (icky != -1) { @@ -1882,7 +1881,7 @@ int items( int allow_uniques, // not just true-false, && you.level_type != LEVEL_PANDEMONIUM) && one_chance_in(50)) { - icky = find_okay_unrandart(OBJ_ARMOUR); + const int icky = find_okay_unrandart(OBJ_ARMOUR); if (icky != -1) { quant = 1; @@ -2592,7 +2591,7 @@ int items( int allow_uniques, // not just true-false, && random2(2000) <= 100 + (item_level * 3) && one_chance_in(20)) { - icky = find_okay_unrandart(OBJ_JEWELLERY); + const int icky = find_okay_unrandart(OBJ_JEWELLERY); if (icky != -1) { |