nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

twoweapon feedback

Browse Source 
When #twoweapon fails, the message referring to "your current form"
sounds pretty odd when you're not polymorphed.
This commit is contained in:
nethack.rankin
2002-05-15 06:48:46 +00:00
parent b5276ed2a0
commit b0872d064f
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes34.1
View File

@@ -103,6 +103,7 @@ disallow mounting a trapped steed to avoid inappropriate trap effects
suppress redundant message when stoning effect transforms a golem
clear worn bits of any object grabbed by shopkeeper to avoid extract_nobj panic
looting any container on a location should suppress looting nearby monsters
give more specific message when forbidden role attempts to use twoweapon mode
Platform- and/or Interface-Specific Fixes

13
src/wield.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)wield.c 3.4 2002/04/16 */
/* SCCS Id: @(#)wield.c 3.4 2002/05/13 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -407,9 +407,14 @@ can_twoweapon()
struct obj *otmp;
#define NOT_WEAPON(obj) (!is_weptool(obj) && obj->oclass != WEAPON_CLASS)
if (!could_twoweap(youmonst.data))
You_cant("use two weapons in your current form.");
else if (!uwep || !uswapwep)
if (!could_twoweap(youmonst.data)) {
if (Upolyd)
You_cant("use two weapons in your current form.");
else
pline("%s aren't able to use two weapons at once.",
makeplural((flags.female && urole.name.f) ?
urole.name.f : urole.name.m));
} else if (!uwep || !uswapwep)
Your("%s%s%s empty.", uwep ? "left " : uswapwep ? "right " : "",
body_part(HAND), (!uwep && !uswapwep) ? "s are" : " is");
else if (NOT_WEAPON(uwep) || NOT_WEAPON(uswapwep)) {