diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-21 16:18:19 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-21 16:18:19 +0000 |
commit | fac344b62ebbf48e7b1d2a7b5f0bcdd3608bd4a7 (patch) | |
tree | 8cc8a0b1312414c79f2c2d6e3d1e455754be41ea /crawl-ref/source/itemname.h | |
parent | b2ea8143ccf52a2cacfa48d19ce2ea603ddaab5e (diff) | |
download | crawl-ref-fac344b62ebbf48e7b1d2a7b5f0bcdd3608bd4a7.tar.gz crawl-ref-fac344b62ebbf48e7b1d2a7b5f0bcdd3608bd4a7.zip |
Eliminated it_name(), in_name(), item_name(). The function to use is
now item_def::name().
Cleaned up a lot of code in the process.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1341 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemname.h')
-rw-r--r-- | crawl-ref/source/itemname.h | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/crawl-ref/source/itemname.h b/crawl-ref/source/itemname.h index a264c6fbe4..e42ecce3ad 100644 --- a/crawl-ref/source/itemname.h +++ b/crawl-ref/source/itemname.h @@ -25,16 +25,6 @@ char get_ident_type(char cla, int ty); /* *********************************************************************** - * called from: acr - chardump - direct - effects - fight - invent - - * it_use2 - item_use - items - monstuff - mstuff2 - ouch - - * shopping - spells1 - spells2 - spells3 - * *********************************************************************** */ -const char *item_name( const item_def &item, char descrip, - char *buff = NULL, - bool terse = false ); - - -/* *********************************************************************** * called from: debug - describe - dungeon - fight - files - item_use - * monstuff - mstuff2 - players - spells0 * *********************************************************************** */ @@ -53,24 +43,8 @@ void check_item_knowledge(void); void clear_ids(void); -/* *********************************************************************** - * called from: direct - fight - food - items - monstuff - religion - - * shopping - * *********************************************************************** */ -const char *it_name(int itn, char des, char *buff = NULL, bool terse = false); - -/* *********************************************************************** - * called from: acr - chardump - command - effects - fight - invent - - * it_use2 - it_use3 - item_use - items - ouch - output - - * spell - spells1 - spells2 - spells3 - spells4 - transfor - * *********************************************************************** */ -const char *in_name(int inn, char des, char *buff = NULL, bool terse = false); - -/* *********************************************************************** - * called from: itemname.cc items.cc item_use.cc mstuff2.cc - * *********************************************************************** */ -const char *quant_name( const item_def &item, int quant, char des, - char buff[ITEMNAME_SIZE], bool terse = false ); +std::string quant_name( const item_def &item, int quant, + description_level_type des, bool terse = false ); /* *********************************************************************** * bit operations called from a large number of files |