diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-08 19:54:47 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-08 19:54:47 +0000 |
| commit | 94e75528f21fb8aa910c06893dfc46ca2785f20f (patch) | |
| tree | 78e426f37a01cb7fecb8e4bc9828266a7ccb3f93 /crawl-ref/source/fight.cc | |
| parent | 6e44de32ed92d31968e1490c7d10ba27e98ee392 (diff) | |
| download | crawl-ref-94e75528f21fb8aa910c06893dfc46ca2785f20f.tar.gz crawl-ref-94e75528f21fb8aa910c06893dfc46ca2785f20f.zip | |
Update documentation for 0.4.
Apply recent commits.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6458 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 c0973cad93..38ae378f58 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -4083,18 +4083,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 |