diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-07 11:49:31 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-07 11:49:31 +0000 |
| commit | 7b4f94503b534ab0da779c24cdcfe84b1dc9e406 (patch) | |
| tree | 39fad75beca88782561753f3847ec031dbf1573d | |
| parent | bb89f09079ee338fcad2d2faa6c7789dda52aec9 (diff) | |
| download | crawl-ref-7b4f94503b534ab0da779c24cdcfe84b1dc9e406.tar.gz crawl-ref-7b4f94503b534ab0da779c24cdcfe84b1dc9e406.zip | |
Fix dropping worn items not checking for !T.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9909 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/items.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index e5c356ba86..fdc9592185 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -1959,7 +1959,8 @@ bool drop_item( int item_dropped, int quant_drop, bool try_offer ) { mpr("You will have to take that off first."); } - else + else if (check_warning_inscriptions(you.inv[item_dropped], + OPER_TAKEOFF)) { // If we take off the item, cue up the item being dropped if (takeoff_armour( item_dropped )) diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 94d5656559..c65c22f4cf 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -2329,7 +2329,7 @@ bool random_near_space(const coord_def& origin, coord_def& target, return (true); // If the monster is on a visible square which is on the other - // side of one or more translucent from the player, then it + // side of one or more translucent walls from the player, then it // can only blink through translucent walls if the end point // is either not visible to the player, or there are at least // as many translucent walls between the player and the end |