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/itemname.h | |
| 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/itemname.h')
| -rw-r--r-- | crawl-ref/source/itemname.h | 38 |
1 files changed, 7 insertions, 31 deletions
diff --git a/crawl-ref/source/itemname.h b/crawl-ref/source/itemname.h index e42ecce3ad..915b070fb2 100644 --- a/crawl-ref/source/itemname.h +++ b/crawl-ref/source/itemname.h @@ -19,12 +19,6 @@ bool is_vowel( const char chr ); /* *********************************************************************** - * called from: describe - effects - item_use - shopping - * *********************************************************************** */ -char get_ident_type(char cla, int ty); - - -/* *********************************************************************** * called from: debug - describe - dungeon - fight - files - item_use - * monstuff - mstuff2 - players - spells0 * *********************************************************************** */ @@ -36,13 +30,6 @@ int property( const item_def &item, int prop_type ); * *********************************************************************** */ void check_item_knowledge(void); - -/* *********************************************************************** - * called from: acr - * *********************************************************************** */ -void clear_ids(void); - - std::string quant_name( const item_def &item, int quant, description_level_type des, bool terse = false ); @@ -63,30 +50,19 @@ int get_weapon_brand( const item_def &item ); int get_ammo_brand( const item_def &item ); int get_armour_ego_type( const item_def &item ); -/* *********************************************************************** - * called from: acr - * *********************************************************************** */ -void init_properties(void); +bool is_interesting_item( const item_def& item ); int make_name( unsigned long seed, bool all_caps, char buff[ ITEMNAME_SIZE ] ); /* *********************************************************************** - * called from: files - shopping - * *********************************************************************** */ -void save_id(id_arr identy, bool saving_game = false); - - -/* *********************************************************************** - * called from: files - item_use - newgame - ouch - shopping - spells1 + * called from: acr * *********************************************************************** */ -void set_ident_type( char cla, int ty, char setting, bool force = false ); +void init_properties(); +id_arr& get_typeid_array(); +item_type_id_state_type get_ident_type(int basetype, int subtype); +void set_ident_type( int basetype, int subtype, + item_type_id_state_type setting, bool force = false); -/* *********************************************************************** - * called from: dungeon - item_use - * *********************************************************************** */ -bool hide2armour( unsigned char *which_subtype ); - -bool is_interesting_item( const item_def& item ); #endif |