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/item_use.cc | |
| 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/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index f643c6d757..1e6984b8aa 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -2139,7 +2139,9 @@ static bool _god_hates_brand(const int brand) static void _rebrand_weapon(item_def& wpn) { - const int old_brand = get_weapon_brand(wpn); + int old_brand = get_weapon_brand(wpn); + if (you.duration[DUR_WEAPON_BRAND]) + old_brand = you.props["orig brand"]; int new_brand = old_brand; const string itname = wpn.name(DESC_YOUR); |