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

fix B15006 - breaking lances with jousting

Browse Source 
Post 3.4.0 bug: "Your a lance (weapon in hand) shatters on impact!"
Use xname() instead of doname() to get "lance" instead of "a lance" here.
It also wasn't giving "you start bashing with your bare/gloved hands" on
the next attack after losing the weapon.
This commit is contained in:
nethack.rankin
2002-12-27 03:29:46 +00:00
parent 676df2da62
commit b9f66bb4c2
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/uhitm.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)uhitm.c 3.4 2002/12/09 */ /* SCCS Id: @(#)uhitm.c 3.4 2002/12/26 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -925,7 +925,10 @@ int thrown;
You("joust %s%s", You("joust %s%s",
mon_nam(mon), canseemon(mon) ? exclam(tmp) : "."); mon_nam(mon), canseemon(mon) ? exclam(tmp) : ".");
if (jousting < 0) { if (jousting < 0) {
Your("%s shatters on impact!", doname(obj)); Your("%s shatters on impact!", xname(obj));
/* (must be either primary or secondary weapon to get here) */
u.twoweap = FALSE; /* untwoweapon() is too verbose here */
if (obj == uwep) uwepgone(); /* set unweapon */
/* minor side-effect: broken lance won't split puddings */ /* minor side-effect: broken lance won't split puddings */
useup(obj); useup(obj);
obj = 0; obj = 0;
@@ -1080,6 +1083,8 @@ struct obj *obj; /* weapon */
int skill_rating, joust_dieroll; int skill_rating, joust_dieroll;
if (Fumbling || Stunned) return 0; if (Fumbling || Stunned) return 0;
/* sanity check; lance must be wielded in order to joust */
if (obj != uwep && (obj != uswapwep || !u.twoweap)) return 0;
/* if using two weapons, use worse of lance and two-weapon skills */ /* if using two weapons, use worse of lance and two-weapon skills */
skill_rating = P_SKILL(weapon_type(obj)); /* lance skill */ skill_rating = P_SKILL(weapon_type(obj)); /* lance skill */