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

luck artifact dependencies

Browse Source 
Instead of adding a new artifact.h to pray.c, remove the existing
ones from attrib.c, invent.c, and mkobj.c.  This also updates the Unix
and VMS editions of Makefile.src; having stale dependencies in those
for other ports could cause unnecessary recompilation but can't break
anything in this case.
This commit is contained in:
nethack.rankin
2002-10-09 07:06:08 +00:00
parent 5a9550819c
commit a0067f97e2
8 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/mkobj.c
View File

@@ -1,9 +1,8 @@
/* SCCS Id: @(#)mkobj.c 3.4 2002/09/21 */
/* SCCS Id: @(#)mkobj.c 3.4 2002/10/07 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
#include "hack.h"
#include "artifact.h"
#include "prop.h"
STATIC_DCL void FDECL(mkbox_cnts,(struct obj *));
@@ -684,8 +683,7 @@ register struct obj *otmp;
#endif
otmp->cursed = 0;
otmp->blessed = 1;
if (otmp->otyp == LUCKSTONE
|| (otmp->oartifact && spec_ability(otmp, SPFX_LUCK)))
if (carried(otmp) && confers_luck(otmp))
set_moreluck();
else if (otmp->otyp == BAG_OF_HOLDING)
otmp->owt = weight(otmp);
@@ -699,8 +697,7 @@ unbless(otmp)
register struct obj *otmp;
{
otmp->blessed = 0;
if (otmp->otyp == LUCKSTONE
|| (otmp->oartifact && spec_ability(otmp, SPFX_LUCK)))
if (carried(otmp) && confers_luck(otmp))
set_moreluck();
else if (otmp->otyp == BAG_OF_HOLDING)
otmp->owt = weight(otmp);
@@ -718,8 +715,7 @@ register struct obj *otmp;
/* welded two-handed weapon interferes with some armor removal */
if (otmp == uwep && bimanual(uwep)) reset_remarm();
/* some cursed items need immediate updating */
if (carried(otmp) && (otmp->otyp == LUCKSTONE ||
(otmp->oartifact && spec_ability(otmp, SPFX_LUCK))))
if (carried(otmp) && confers_luck(otmp))
set_moreluck();
else if (otmp->otyp == BAG_OF_HOLDING)
otmp->owt = weight(otmp);
@@ -737,13 +733,12 @@ uncurse(otmp)
register struct obj *otmp;
{
otmp->cursed = 0;
if (otmp->otyp == LUCKSTONE
|| (otmp->oartifact && spec_ability(otmp, SPFX_LUCK)))
if (carried(otmp) && confers_luck(otmp))
set_moreluck();
else if (otmp->otyp == BAG_OF_HOLDING)
otmp->owt = weight(otmp);
otmp->owt = weight(otmp);
else if (otmp->otyp == FIGURINE && otmp->timed)
(void) stop_timer(FIG_TRANSFORM, (genericptr_t) otmp);
(void) stop_timer(FIG_TRANSFORM, (genericptr_t) otmp);
return;
}