diff options
-rw-r--r-- | crawl-ref/source/beam.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/invent.cc | 3 | ||||
-rw-r--r-- | crawl-ref/source/invent.h | 9 | ||||
-rw-r--r-- | crawl-ref/source/libgui.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/monspeak.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/monstuff.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/spl-book.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/spl-cast.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/tiles.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/tutorial.cc | 4 |
10 files changed, 18 insertions, 14 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 33ccaad9b6..00ecbfff4e 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -1569,7 +1569,7 @@ void fire_beam( bolt &pbolt, item_def *item, bool drop_item ) // canned msg for enchantments that affected no-one, but only if the // enchantment is yours. - if (pbolt.name[0] == '0' && pbolt.flavour != BEAM_DIGGING) + if (pbolt.name[0] == '0') { if (!pbolt.is_tracer && !pbolt.msg_generated && !pbolt.obvious_effect && YOU_KILL(pbolt.thrower)) diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index 49e497070a..53289b4036 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -754,6 +754,9 @@ static bool item_class_selected(const item_def &i, int selector) case OSEL_WIELD: return (itype == OBJ_WEAPONS || itype == OBJ_STAVES || itype == OBJ_MISCELLANY); + case OSEL_MEMORISE: + return (itype == OBJ_BOOKS && i.sub_type != BOOK_MANUAL + && (i.sub_type != BOOK_DESTRUCTION || !item_type_known(i))); case OBJ_SCROLLS: return (itype == OBJ_SCROLLS || itype == OBJ_BOOKS); case OSEL_EQUIP: diff --git a/crawl-ref/source/invent.h b/crawl-ref/source/invent.h index 747ebac85f..f3473810fd 100644 --- a/crawl-ref/source/invent.h +++ b/crawl-ref/source/invent.h @@ -22,10 +22,11 @@ enum object_selector { - OSEL_ANY = -1, - OSEL_WIELD = -2, - OSEL_UNIDENT = -3, - OSEL_EQUIP = -4 + OSEL_ANY = -1, + OSEL_WIELD = -2, + OSEL_UNIDENT = -3, + OSEL_EQUIP = -4, + OSEL_MEMORISE = -5 }; #define PROMPT_ABORT -1 diff --git a/crawl-ref/source/libgui.cc b/crawl-ref/source/libgui.cc index f0213fa513..ffdcac943e 100644 --- a/crawl-ref/source/libgui.cc +++ b/crawl-ref/source/libgui.cc @@ -1375,7 +1375,7 @@ static int handle_mouse_motion(int mouse_x, int mouse_y, bool init) && you.inv[ix].sub_type != BOOK_MANUAL && you.inv[ix].sub_type != BOOK_DESTRUCTION) { - desc += "Memorize (M)"; + desc += "Memorise (M)"; break; } // else fall-through diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/monspeak.cc index b9275036b5..70a9c6643b 100644 --- a/crawl-ref/source/monspeak.cc +++ b/crawl-ref/source/monspeak.cc @@ -48,7 +48,7 @@ static std::string get_speak_string(const std::vector<std::string> prefixes, { std::string prefix = ""; bool silenced = false; - const int size = prefixes.size(); + const int size = prefixes.size(); for (int i = 0; i < size; i++) { if (prefixes[i] == "silenced") diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 1fc75859de..78f0cb843d 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -5187,7 +5187,7 @@ static bool is_trap_safe(const monsters *monster, const int trap_x, // * permanent friendlies can be assumed to have been warned by the // player about all traps s/he knows about // * very intelligent monsters can be assumed to have a high T&D skill - // (or have memorized part of the dungeon layout ;) ) + // (or have memorised part of the dungeon layout ;) ) if (intel >= I_NORMAL && mechanical && (is_native_in_branch(monster, you.where_are_you) || monster->attitude == ATT_FRIENDLY diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 839070e53a..d1d0d6f140 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -975,7 +975,7 @@ static int which_spellbook( void ) avail_levels, (avail_levels > 1) ? "s" : "" ); book = prompt_invent_item("Memorise from which spellbook?", MT_INVLIST, - OBJ_BOOKS ); + OSEL_MEMORISE ); if (book == PROMPT_ABORT) { canned_msg( MSG_OK ); @@ -998,7 +998,7 @@ static int which_spellbook( void ) return (book); } // end which_spellbook() -// Returns false if the player cannot read/memorize from the book, +// Returns false if the player cannot read/memorise from the book, // and true otherwise. -- bwr bool player_can_read_spellbook( const item_def &book ) { diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index a90515e36e..d86ad11afe 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -830,7 +830,7 @@ static bool spell_is_uncastable(spell_type spell) return (true); } - // Normally undead can't memorize these spells, so this check is + // Normally undead can't memorise these spells, so this check is // to catch those in Lich form. As such, we allow the Lich form // to be extended here. -- bwr if (spell != SPELL_NECROMUTATION diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h index 6578823d37..74cb94a626 100644 --- a/crawl-ref/source/tiles.h +++ b/crawl-ref/source/tiles.h @@ -82,7 +82,7 @@ int TileDrawCursor(int x, int y, int flag); void TileDrawBolt(int x, int y, int fg); // display dungeon: tileb = { fg(0,0),bg(0,0),fg(1,0),bg(1,0), .. void TileDrawDungeon(unsigned int *tileb); -// display memorized dungeon +// display memorised dungeon void TileDrawFarDungeon(int cx, int cy); // display map centered on grid coords void TileDrawMap(int gx, int gy); diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index 0208067c95..80ef83c2df 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -1961,7 +1961,7 @@ void tutorial_describe_item(const item_def &item) { if (you.religion == GOD_TROG) { - ostr << "A spellbook! You could <w>M</w>emorize some " + ostr << "A spellbook! You could <w>M</w>emorise some " "spells and then cast them with <w>Z</w>. "; ostr << "\nAs a worshipper of " << god_name(GOD_TROG) @@ -1974,7 +1974,7 @@ void tutorial_describe_item(const item_def &item) } else if (!you.skills[SK_SPELLCASTING]) { - ostr << "A spellbook! You could <w>M</w>emorize some " + ostr << "A spellbook! You could <w>M</w>emorise some " "spells and then cast them with <w>Z</w>. "; ostr << "\nFor now, however, that will have to wait " "until you've learned the basics of Spellcasting " |