summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemprop.cc
diff options
context:
space:
mode:
authorShmuale Mark <shm.mark@gmail.com>2014-06-12 13:26:47 -0400
committerShmuale Mark <shm.mark@gmail.com>2014-06-12 13:41:10 -0400
commite561a6638b9c70b2f3ad265faa83520c7af28226 (patch)
treeeb7e8c675d6119f1f1915ce90d3b26ef922b3973 /crawl-ref/source/itemprop.cc
parentb80c8152ad0ca63863a0ba367b1fede1f4b36504 (diff)
downloadcrawl-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/itemprop.cc')
-rw-r--r--crawl-ref/source/itemprop.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 99b03397aa..144b9c0d41 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -1527,12 +1527,6 @@ bool is_brandable_weapon(const item_def &wpn, bool allow_ranged)
return false;
}
- if (you.duration[DUR_WEAPON_BRAND] != 0
- && you.weapon() == &wpn)
- {
- return false;
- }
-
return true;
}