From 9e4917b395de21adb6caa2bb838d4f45f2850f1a Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 19 Jul 2009 12:52:21 +0000 Subject: ATTR_RUNES_IN_ZOT is no longer needed. I couldn't decide if I should simply remove it or leave it for the weak save file compatibility we try to maintain within trunk, so I left its definition in enum.h. Also, change Beogh's altar tile to include the orcish idol. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10305 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/items.cc | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'crawl-ref/source/items.cc') diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index a9b4ff1d98..285abfdaad 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -266,9 +266,6 @@ bool dec_mitm_item_quantity( int obj, int amount ) if (mitm[obj].quantity <= amount) amount = mitm[obj].quantity; - if (player_in_branch(BRANCH_HALL_OF_ZOT) && is_rune(mitm[obj])) - you.attribute[ATTR_RUNES_IN_ZOT] -= amount; - if (mitm[obj].quantity == amount) { destroy_item( obj ); @@ -299,9 +296,6 @@ void inc_inv_item_quantity( int obj, int amount, bool suppress_burden ) void inc_mitm_item_quantity( int obj, int amount ) { - if (player_in_branch(BRANCH_HALL_OF_ZOT) && is_rune(mitm[obj])) - you.attribute[ATTR_RUNES_IN_ZOT] += amount; - mitm[obj].quantity += amount; } @@ -531,9 +525,6 @@ static void _handle_gone_item(const item_def &item) else you.attribute[ATTR_DEMONIC_RUNES] -= item.quantity; } - - if (player_in_branch(BRANCH_HALL_OF_ZOT) && !in_inventory(item)) - you.attribute[ATTR_RUNES_IN_ZOT] -= item.quantity; } } @@ -1769,18 +1760,8 @@ bool move_item_to_grid( int *const obj, const coord_def& p ) item.link = igrd(p); igrd(p) = ob; - if (is_rune(item)) - { - if (player_in_branch(BRANCH_HALL_OF_ZOT)) - you.attribute[ATTR_RUNES_IN_ZOT] += item.quantity; - } - else if (item.base_type == OBJ_ORBS && you.level_type == LEVEL_DUNGEON) - { + if (item.base_type == OBJ_ORBS && you.level_type == LEVEL_DUNGEON) set_branch_flags(BFLAG_HAS_ORB); - } - -// if (see_grid(p)) -// StashTrack.update_stash(p); return (true); } -- cgit v1.2.3-54-g00ecf