diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-14 15:31:00 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-14 15:31:00 +0000 |
| commit | 2ed4f389c28fa47ae5e16d747d0eb81e3a498acf (patch) | |
| tree | 06494a4ca20aacd8b75dea9d14496d2c15ef37d2 /crawl-ref/source/food.cc | |
| parent | 85e11d2d3c892c2ffcd53b0bf55c0e83ce13fb9d (diff) | |
| download | crawl-ref-2ed4f389c28fa47ae5e16d747d0eb81e3a498acf.tar.gz crawl-ref-2ed4f389c28fa47ae5e16d747d0eb81e3a498acf.zip | |
* Fix 2477235: Use inscription check when switching back from butchering
tool in case it was autoinscribed {!w}.
* Make TSO reclaim holy wrath weapons an Elyvilon worshipper is
attempting to destroy (flavour only). (FR 2497133)
* Disallow Dissolution outside of the Slime Pits.
* Explain 'e' as "Drain corpses" for Vampires in the command help.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8450 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/food.cc')
| -rw-r--r-- | crawl-ref/source/food.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 1f2e9e4175..eebb9f5932 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -130,6 +130,13 @@ void set_hunger(int new_hunger_level, bool suppress_msg) // care of by calling wield_effects(). {gdl} void weapon_switch(int targ) { + if (you.equip[EQ_WEAPON] != -1 + && !check_old_item_warning(you.inv[you.equip[EQ_WEAPON]], + OPER_WIELD)) + { + return; + } + if (targ == -1) // Unarmed Combat. { // Already unarmed? @@ -319,7 +326,7 @@ static bool _prepare_butchery(bool can_butcher, bool removed_gloves, mprf("Switching to %s.", butchering_tool == -1 ? "unarmed" : "a butchering implement"); - if (!wield_weapon(true, butchering_tool, false)) + if (!wield_weapon(true, butchering_tool, false, true)) return (false); } |