diff options
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/itemname.cc | 7 | ||||
| -rw-r--r-- | crawl-ref/source/spl-book.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/tiles.h | 10 |
3 files changed, 6 insertions, 12 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 9f10028228..185e9b86f4 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -2608,11 +2608,12 @@ bool is_useless_item(const item_def &item, bool temp) break; case OBJ_FOOD: - if (item.sub_type != FOOD_CHUNK || !is_inedible(item)) + if (!is_inedible(item)) return (false); - if (you.has_spell(SPELL_SUBLIMATION_OF_BLOOD) - || you.has_spell(SPELL_SIMULACRUM)) + if (item.sub_type == FOOD_CHUNK + && (you.has_spell(SPELL_SUBLIMATION_OF_BLOOD) + || you.has_spell(SPELL_SIMULACRUM))) { return (false); } diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 7f6c98f44e..a7abd01d38 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -1075,6 +1075,7 @@ static int _which_spellbook( void ) mprf("You can memorise %d more level%s of spells.", avail_levels, (avail_levels > 1) ? "s" : "" ); + flush_prev_message(); book = prompt_invent_item("Memorise from which spellbook?", MT_INVLIST, OSEL_MEMORISE ); diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h index 14ca6ccdb9..9245dc272b 100644 --- a/crawl-ref/source/tiles.h +++ b/crawl-ref/source/tiles.h @@ -146,15 +146,7 @@ enum tile_flags TILE_FLAG_POISON = 0x00020000, TILE_FLAG_FLAME = 0x00040000, TILE_FLAG_ANIM_WEP = 0x00080000, -/* - // MDAM has 5 possibilities, so uses 3 bits. - TILE_FLAG_MDAM_MASK = 0x00780000, - TILE_FLAG_MDAM_LIGHT= 0x00100000, - TILE_FLAG_MDAM_MOD = 0x00180000, - TILE_FLAG_MDAM_HEAVY= 0x00200000, - TILE_FLAG_MDAM_SEV = 0x00280000, - TILE_FLAG_MDAM_ADEAD= 0x00400000, -*/ + // MDAM has 5 possibilities, so uses 3 bits. TILE_FLAG_MDAM_MASK = 0x03800000, TILE_FLAG_MDAM_LIGHT= 0x00800000, |