diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-06-12 13:26:47 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-06-12 13:41:10 -0400 |
| commit | e561a6638b9c70b2f3ad265faa83520c7af28226 (patch) | |
| tree | eb7e8c675d6119f1f1915ce90d3b26ef922b3973 /crawl-ref/source/itemname.h | |
| parent | b80c8152ad0ca63863a0ba367b1fede1f4b36504 (diff) | |
| download | crawl-ref-e561a6638b9c70b2f3ad265faa83520c7af28226.tar.gz crawl-ref-e561a6638b9c70b2f3ad265faa83520c7af28226.zip | |
Allow temporary branding to go over a permanent brand.
Toting around an unbranded weapon just to be able to swap to it
is no fun, and not even that much more of a difficulty; maybe it
just means getting pain out takes 0.7 more turns or so. You still
can't overwrite artefacts, of course.
Diffstat (limited to 'crawl-ref/source/itemname.h')
| -rw-r--r-- | crawl-ref/source/itemname.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/itemname.h b/crawl-ref/source/itemname.h index 6532ccfced..44c14580ed 100644 --- a/crawl-ref/source/itemname.h +++ b/crawl-ref/source/itemname.h @@ -101,7 +101,7 @@ bool is_useless_item(const item_def &item, bool temp = false); string make_name(uint32_t seed, bool all_caps, int maxlen = -1, char start = 0); -const char* weapon_brand_name(const item_def& item, bool terse); +const char* weapon_brand_name(const item_def& item, bool terse, int override_brand = -1); const char* armour_ego_name(const item_def& item, bool terse); bool item_type_has_ids(object_class_type base_type); @@ -134,7 +134,7 @@ string base_type_string(const item_def &item, bool known = true); string sub_type_string(const item_def &item, bool known = true); -string ego_type_string(const item_def &item, bool terse = false); +string ego_type_string(const item_def &item, bool terse = false, int override_brand = -1); const char* potion_type_name(int potiontype); //used in xom.cc #endif |