diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-13 08:03:10 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-13 08:03:10 +0000 |
commit | 6be49f6bbc97b009200844fd8f3d6f8f07dacacf (patch) | |
tree | 3dc151b367505bc35dcc48a4098a8d557a4ab22b /crawl-ref/source/itemprop.h | |
parent | 0a577362dfe772e6e13eebce39489327b282c98d (diff) | |
download | crawl-ref-6be49f6bbc97b009200844fd8f3d6f8f07dacacf.tar.gz crawl-ref-6be49f6bbc97b009200844fd8f3d6f8f07dacacf.zip |
More naming fixes. We should integrate helmets somehow.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1292 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemprop.h')
-rw-r--r-- | crawl-ref/source/itemprop.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h index 897eb3ef28..5536355779 100644 --- a/crawl-ref/source/itemprop.h +++ b/crawl-ref/source/itemprop.h @@ -146,7 +146,7 @@ bool is_shield_incompatible(const item_def &weapon, const item_def *shield = NULL); // Only works for armour/weapons/missiles -const char* item_base_name(const item_def &item); -const char* item_base_name(object_class_type basetype, unsigned char subtype); +std::string item_base_name(const item_def &item); +const char* weapon_base_name(unsigned char subtype); #endif |