From 8aaaca3d1c38a41d88b6dddf55fa48fd9aecb539 Mon Sep 17 00:00:00 2001 From: Vsevolod Kozlov Date: Fri, 6 Nov 2009 15:54:52 +0300 Subject: Rename is_valid_item to item_def::is_valid. Signed-off-by: Jude Brown --- crawl-ref/source/xom.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/xom.cc') diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index d6ab40cecc..7b038bb1e1 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -1632,7 +1632,7 @@ static int _xom_swap_weapons(bool debug = false) int freeslot = find_free_slot(mitm[monwpn]); if (freeslot < 0 || freeslot >= ENDOFPACK - || is_valid_item(you.inv[freeslot])) + || you.inv[freeslot].is_valid()) { // Something is terribly wrong. return (XOM_DID_NOTHING); @@ -2310,7 +2310,7 @@ static void _xom_zero_miscast() for (int i = 0; i < ENDOFPACK; ++i) { const item_def &item(you.inv[i]); - if (is_valid_item(item) && !item_is_equipped(item) + if (item.is_valid() && !item_is_equipped(item) && !item_is_critical(item)) { inv_items.push_back(i); -- cgit v1.2.3-54-g00ecf