diff options
| author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-06 15:54:52 +0300 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2009-11-06 23:22:04 +1000 |
| commit | 8aaaca3d1c38a41d88b6dddf55fa48fd9aecb539 (patch) | |
| tree | 7e3d75c7a1f32cc41facc17d36986df022a5870a /crawl-ref/source/xom.cc | |
| parent | cddc002566e2f235a3785e12d534ebc0202bb53e (diff) | |
| download | crawl-ref-8aaaca3d1c38a41d88b6dddf55fa48fd9aecb539.tar.gz crawl-ref-8aaaca3d1c38a41d88b6dddf55fa48fd9aecb539.zip | |
Rename is_valid_item to item_def::is_valid.
Signed-off-by: Jude Brown <bookofjude@users.sourceforge.net>
Diffstat (limited to 'crawl-ref/source/xom.cc')
| -rw-r--r-- | crawl-ref/source/xom.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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); |