diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-30 10:53:06 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-30 10:53:06 +0000 |
| commit | 262b8e18ed8cb58afb40a816ac0fdedfe3a7db5f (patch) | |
| tree | 681a9cbb6c22669c6e8b7ab749228a3cd691a903 /crawl-ref/source/itemname.cc | |
| parent | 51d8f1fc9cc8ed4280b9c53b135ccb0521e84889 (diff) | |
| download | crawl-ref-262b8e18ed8cb58afb40a816ac0fdedfe3a7db5f.tar.gz crawl-ref-262b8e18ed8cb58afb40a816ac0fdedfe3a7db5f.zip | |
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
Diffstat (limited to 'crawl-ref/source/itemname.cc')
| -rw-r--r-- | crawl-ref/source/itemname.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index daff922b71..c0cca7b5dd 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -196,7 +196,7 @@ std::string item_def::name(description_level_type descrip, buff << auxname; bool equipped = false; - if (descrip == DESC_INVENTORY_EQUIP && this->x == -1 && this->y == -1) + if (descrip == DESC_INVENTORY_EQUIP && in_inventory(*this)) { ASSERT( this->link != -1 ); |