diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-13 08:04:42 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-13 08:04:42 +0000 |
| commit | cab797009b47f77520b8db9f8b427ba9ea14f63c (patch) | |
| tree | 3257807bf2686cfb1a5f2f9d9f66040eb2df6ef4 /crawl-ref/source/delay.cc | |
| parent | 659553d325a49df4870dcfa18af7f9bece5cbf16 (diff) | |
| download | crawl-ref-cab797009b47f77520b8db9f8b427ba9ea14f63c.tar.gz crawl-ref-cab797009b47f77520b8db9f8b427ba9ea14f63c.zip | |
* Allow panlords to have the chaos-branded weapons.
* update stash tracker after Xom's teleportation journey.
* A few tweaks to Xom debug noting.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9599 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
| -rw-r--r-- | crawl-ref/source/delay.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 5a47ce5e96..68b662178b 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -408,7 +408,6 @@ void stop_delay( bool stop_stair_travel ) if (!i_feel_safe()) handle_interrupted_swap(false, true); } - break; } case DELAY_MEMORISE: @@ -560,7 +559,8 @@ void handle_interrupted_swap(bool swap_if_safe, bool force_unsafe, bool transform) { if (!you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] - || !you_tran_can_wear(EQ_WEAPON) || you.cannot_act()) + || !you_tran_can_wear(EQ_WEAPON) || you.cannot_act() + || you.duration[DUR_BERSERKER]) { return; } |