diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-04 21:18:28 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-04 21:18:28 +0000 |
commit | adf10d7dd27e29e7cfd6ce3d7d0a16fb29e6ce5c (patch) | |
tree | 3bea1eb6e474e58d0aa2ac78334259048bcae904 /crawl-ref/source/effects.cc | |
parent | a51373bd73dcf4a99fa895ad24508ce5af2d426a (diff) | |
download | crawl-ref-adf10d7dd27e29e7cfd6ce3d7d0a16fb29e6ce5c.tar.gz crawl-ref-adf10d7dd27e29e7cfd6ce3d7d0a16fb29e6ce5c.zip |
Fix 2815574: Venom card not waking monsters.
Fix 2815185: Not updating wield display for rotting chunks.
Fix 2812496: Wrong message when attempting to chop with unwieldable
weapons. (Small patch by rafalmaj.)
Fix 2811476: Turn autopickup back on when gaining see invisible
(mutation, ring, artefact, spell).
Fix 2806314: Remove coinflip() for Sandblast range. Wielding rocks now
guarantees range of 2.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10096 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r-- | crawl-ref/source/effects.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 7ef9ec7a2a..c1f9aa1759 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -592,7 +592,7 @@ bool lose_stat(unsigned char which_stat, unsigned char stat_loss, bool force, const char *cause, bool see_source) { bool statLowered = false; // must initialize to false {dlb} - char *ptr_stat = NULL; + char *ptr_stat = NULL; bool *ptr_redraw = NULL; char newValue = 0; // holds new value, for comparison to old {dlb} @@ -3045,7 +3045,8 @@ static void _rot_inventory_food(long time_delta) } turn_corpse_into_skeleton(item); - you.wield_change = true; + if (you.equip[EQ_WEAPON] == i) + you.wield_change = true; burden_changed_by_rot = true; num_corpses_rotted++; @@ -3059,6 +3060,8 @@ static void _rot_inventory_food(long time_delta) && (item.special + (time_delta / 20) >= 100)) { rotten_items.push_back(index_to_letter(i)); + if (you.equip[EQ_WEAPON] == i) + you.wield_change = true; } } |