diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-24 22:38:41 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-24 22:38:41 +0000 |
| commit | 9304ae6cc3684377e50e6fcbc3d13e80fa092b6a (patch) | |
| tree | b0b15e708dbca7e6455bf0e6e3726b75037f937b /crawl-ref/source/itemprop.cc | |
| parent | 56b6c4f46ec7516396c1473e9d5bfef7ea79765f (diff) | |
| download | crawl-ref-9304ae6cc3684377e50e6fcbc3d13e80fa092b6a.tar.gz crawl-ref-9304ae6cc3684377e50e6fcbc3d13e80fa092b6a.zip | |
Cleaned up shop-handling code considerably.
Instead of shops passing around global id_arr arrays, shops use the newly
added third argument to item_def::name() which indicates whether to
override item ID status.
This means that the shop ID SIGHUP protection is now unnecessary; it's
been removed.
Hopefully I caught all the places where the stash tracker tries to get
item names and fixed them, but I might have missed something.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1359 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 6059fff200..4f37cf22b7 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -398,7 +398,7 @@ static food_def Food_prop[NUM_FOODS] = // Must call this functions early on so that the above tables can // be accessed correctly. -void init_properties(void) +void init_properties() { int i; @@ -460,7 +460,8 @@ void set_ident_flags( item_def &item, unsigned long flags ) { const bool known_before = fully_identified(item); item.flags |= flags; - if ( !known_before && fully_identified(item) && is_interesting_item(item)) + if ( notes_are_active() && + !known_before && fully_identified(item) && is_interesting_item(item)) { /* make a note of it */ take_note(Note(NOTE_ID_ITEM, 0, 0, item.name(DESC_NOCAP_A).c_str(), |