diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-08 19:20:33 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-08 19:20:33 +0000 |
| commit | a1dd025c4efbc80f6e56d03b66fabe005f87751f (patch) | |
| tree | 6a7c00cb6b0ea45e6e2f45a9c10957faa7769db0 /crawl-ref/source/fight.cc | |
| parent | f9b9c28845db9d3eb50ed242a14327305a617850 (diff) | |
| download | crawl-ref-a1dd025c4efbc80f6e56d03b66fabe005f87751f.tar.gz crawl-ref-a1dd025c4efbc80f6e56d03b66fabe005f87751f.zip | |
Update README files (courtesy of David), some minor tutorial
corrections, and make Xom ignore your attempts to amuse him by
deliberately casting spells at yourself. (Rebounding lightning bolts
will still amuse him.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6457 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index bb1d18b778..f5821ebb84 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -4082,18 +4082,13 @@ static bool wielded_weapon_check(const item_def *weapon) && (weapon->base_type != OBJ_WEAPONS || is_range_weapon(*weapon)) || you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED])) { - if (item_cursed(*weapon)) - { - mpr("You might want to wield a more suitable implement when " - "attacking monsters.", MSGCH_WARN); - } + std::string prompt = "Really attack while "; + if (!weapon) + prompt += "being unarmed?"; else - { - std::string prompt = "Really attack while wielding " - + weapon->name(DESC_NOCAP_YOUR) + "? "; + prompt += "wielding " + weapon->name(DESC_NOCAP_YOUR) + "? "; - result = yesno(prompt.c_str(), true, 'n'); - } + result = yesno(prompt.c_str(), true, 'n'); learned_something_new(TUT_WIELD_WEAPON); // for tutorial Rangers |