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/invent.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/invent.cc') diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index 3d05ec4bf1..513a09685e 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -143,7 +143,7 @@ const bool InvEntry::is_item_art() const const bool InvEntry::is_item_equipped() const { - if (item->link == -1 || item->x != -1 || item->y != -1) + if (item->link == -1 || item->pos.x != -1 || item->pos.y != -1) return(false); for (int i = 0; i < NUM_EQUIP; i++) @@ -695,7 +695,7 @@ unsigned char InvMenu::getkey() const bool in_inventory( const item_def &i ) { - return i.x == -1 && i.y == -1; + return i.pos.x == -1 && i.pos.y == -1; } unsigned char get_invent( int invent_type ) -- cgit v1.2.3-54-g00ecf