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

artifact manipulation

Browse Source 
Fix an item from <Someone>'s list:  invoking or applying an
artifact might blast you; if it evades your grasp, the intended
action won't take place but will still use up a turn.
This commit is contained in:
nethack.rankin
2002-08-01 23:20:34 +00:00
parent 7191f3b8a5
commit 9fa85b109b
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes34.1
View File

@@ -178,6 +178,7 @@ if you can't see or sense a monster when it dies, don't set dknown on corpse
effect of wearing or removing the Eyes of the Overworld took effect on the effect of wearing or removing the Eyes of the Overworld took effect on the
next move, but should take effect immediately. next move, but should take effect immediately.
dragon scale mail is magic armor dragon scale mail is magic armor
invoking or applying an artifact must pass a touch_artifact check
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes

6
src/apply.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)apply.c 3.4 2002/04/18 */ /* SCCS Id: @(#)apply.c 3.4 2002/08/01 */
/* 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. */
@@ -2731,6 +2731,10 @@ doapply()
obj = getobj(class_list, "use or apply"); obj = getobj(class_list, "use or apply");
if(!obj) return 0; if(!obj) return 0;
if (obj->oartifact && !touch_artifact(obj, &youmonst))
return 1; /* evading your grasp costs a turn; just be
grateful that you don't drop it as well */
if (obj->oclass == WAND_CLASS) if (obj->oclass == WAND_CLASS)
return do_break_wand(obj); return do_break_wand(obj);

5
src/artifact.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)artifact.c 3.4 2002/03/22 */ /* SCCS Id: @(#)artifact.c 3.4 2002/08/01 */
/* 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. */
@@ -1096,7 +1096,8 @@ doinvoke()
register struct obj *obj; register struct obj *obj;
obj = getobj(invoke_types, "invoke"); obj = getobj(invoke_types, "invoke");
if(!obj) return 0; if (!obj) return 0;
if (obj->oartifact && !touch_artifact(obj, &youmonst)) return 1;
return arti_invoke(obj); return arti_invoke(obj);
} }