diff options
Diffstat (limited to 'crawl-ref/source/misc.cc')
-rw-r--r-- | crawl-ref/source/misc.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index bdfd78fbe0..f9613ac9c8 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -262,7 +262,7 @@ static void _compare_blood_quantity(item_def &stack, int timer_size) void maybe_coagulate_blood_potions_floor(int obj) { item_def &blood = mitm[obj]; - ASSERT(is_valid_item(blood)); + ASSERT(blood.is_valid()); ASSERT(is_blood_potion(blood)); CrawlHashTable &props = blood.props; @@ -460,7 +460,7 @@ static void _potion_stack_changed_message(item_def &potion, int num_changed, // Also handles coagulation messages. bool maybe_coagulate_blood_potions_inv(item_def &blood) { - ASSERT(is_valid_item(blood)); + ASSERT(blood.is_valid()); ASSERT(is_blood_potion(blood)); CrawlHashTable &props = blood.props; @@ -567,7 +567,7 @@ bool maybe_coagulate_blood_potions_inv(item_def &blood) // Now that coagulating is necessary, check inventory for !coagulated blood. for (int m = 0; m < ENDOFPACK; m++) { - if (!is_valid_item(you.inv[m])) + if (!you.inv[m].is_valid()) continue; if (you.inv[m].base_type == OBJ_POTIONS @@ -780,7 +780,7 @@ bool maybe_coagulate_blood_potions_inv(item_def &blood) // Mostly used for (q)uaff, (f)ire, and Evaporate. long remove_oldest_blood_potion(item_def &stack) { - ASSERT(is_valid_item(stack)); + ASSERT(stack.is_valid()); ASSERT(is_blood_potion(stack)); CrawlHashTable &props = stack.props; @@ -801,7 +801,7 @@ long remove_oldest_blood_potion(item_def &stack) // Used whenever copies of blood potions have to be cleaned up. void remove_newest_blood_potion(item_def &stack, int quant) { - ASSERT(is_valid_item(stack)); + ASSERT(stack.is_valid()); ASSERT(is_blood_potion(stack)); CrawlHashTable &props = stack.props; @@ -836,7 +836,7 @@ void remove_newest_blood_potion(item_def &stack, int quant) void merge_blood_potion_stacks(item_def &source, item_def &dest, int quant) { - if (!is_valid_item(source) || !is_valid_item(dest)) + if (!source.is_valid() || !dest.is_valid()) return; ASSERT(quant > 0 && quant <= source.quantity); @@ -957,7 +957,7 @@ void split_potions_into_decay( int obj, int amount, bool need_msg ) ASSERT(obj != -1); item_def &potion = you.inv[obj]; - ASSERT(is_valid_item(potion)); + ASSERT(potion.is_valid()); ASSERT(potion.base_type == OBJ_POTIONS); ASSERT(amount > 0); ASSERT(amount <= potion.quantity); @@ -1009,7 +1009,7 @@ void split_potions_into_decay( int obj, int amount, bool need_msg ) // Else, create new stack in inventory. int freeslot = find_free_slot(you.inv[obj]); if (freeslot >= 0 && freeslot < ENDOFPACK - && !is_valid_item(you.inv[freeslot])) + && !you.inv[freeslot].is_valid()) { item_def &item = you.inv[freeslot]; item.link = freeslot; @@ -1530,7 +1530,7 @@ static int runes_in_pack(std::vector<int> &runes) for (int i = 0; i < ENDOFPACK; i++) { - if (is_valid_item(you.inv[i]) + if (you.inv[i].is_valid() && you.inv[i].base_type == OBJ_MISCELLANY && you.inv[i].sub_type == MISC_RUNE_OF_ZOT) { @@ -1750,7 +1750,7 @@ static bool _check_carrying_orb() // So we did pick up the Orb. Now check whether we're carrying it. for (int i = 0; i < ENDOFPACK; i++) { - if (is_valid_item( you.inv[i] ) + if (you.inv[i].is_valid() && you.inv[i].base_type == OBJ_ORBS && you.inv[i].sub_type == ORB_ZOT) { @@ -1873,7 +1873,7 @@ void up_stairs(dungeon_feature_type force_stair, for (int i = 0; i < ENDOFPACK; i++) { - if (is_valid_item( you.inv[i] ) + if (you.inv[i].is_valid() && you.inv[i].base_type == OBJ_ORBS) { ouch(INSTANT_DEATH, NON_MONSTER, KILLED_BY_WINNING); |