From 262b8e18ed8cb58afb40a816ac0fdedfe3a7db5f Mon Sep 17 00:00:00 2001 From: haranp Date: Wed, 30 Jul 2008 10:53:06 +0000 Subject: Massive overhaul to move towards coord_def(). This might have introduced some bugs: I now get intermittent crashes on startup (this might have to do with the changes to special_room.) Sorry about that - committing before I need to do any more big conflict resolutions. Fixes coming later. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6732 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/itemprop.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/itemprop.cc') diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 2327307d4f..918add8ee3 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -26,6 +26,7 @@ #include "decks.h" #include "food.h" +#include "invent.h" #include "items.h" #include "itemprop.h" #include "it_use2.h" @@ -485,7 +486,7 @@ void do_curse_item( item_def &item, bool quiet ) // Xom is amused by the player's items being cursed, especially // if they're worn/equipped. - if (item.x == -1 && item.y == -1) + if (in_inventory(item)) { int amusement = 64; @@ -519,7 +520,7 @@ void do_curse_item( item_def &item, bool quiet ) void do_uncurse_item( item_def &item ) { - if (item.x == -1 && item.y == -1 && you.equip[EQ_WEAPON] == item.link) + if (in_inventory(item) && you.equip[EQ_WEAPON] == item.link) { // Redraw the weapon. you.wield_change = true; -- cgit v1.2.3-54-g00ecf