summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player-reacts.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-06-12 14:05:34 -0400
committerNeil Moore <neil@s-z.org>2014-06-12 14:06:20 -0400
commit62da3a1b50ace201ebcccd202515e3685b5e3234 (patch)
tree84de9535e9db7a32c29ec450f059fce02bebb07b /crawl-ref/source/player-reacts.cc
parente561a6638b9c70b2f3ad265faa83520c7af28226 (diff)
downloadcrawl-ref-62da3a1b50ace201ebcccd202515e3685b5e3234.tar.gz
crawl-ref-62da3a1b50ace201ebcccd202515e3685b5e3234.zip
Don't crash when unwielding a temp-branded weapon.
Diffstat (limited to 'crawl-ref/source/player-reacts.cc')
-rw-r--r--crawl-ref/source/player-reacts.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/player-reacts.cc b/crawl-ref/source/player-reacts.cc
index 6d9e2c92bf..83abf715c4 100644
--- a/crawl-ref/source/player-reacts.cc
+++ b/crawl-ref/source/player-reacts.cc
@@ -513,7 +513,8 @@ static void _decrement_durations()
if (you.duration[DUR_WEAPON_BRAND] <= 0)
{
you.duration[DUR_WEAPON_BRAND] = 1;
- end_weapon_brand(true);
+ ASSERT(you.weapon());
+ end_weapon_brand(*you.weapon(), true);
}
}