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

more set_corpsenm (trunk only)

Browse Source 
Use set_corpsenm() in a few more places.
This commit is contained in:
nethack.allison
2006-07-30 20:08:57 +00:00
parent 557f94c83a
commit 7f826cd288
8 changed files with 66 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/objnam.c
View File

@@ -2787,14 +2787,9 @@ typfnd:
case CORPSE:
if (!(mons[mntmp].geno & G_UNIQ) &&
!(mvitals[mntmp].mvflags & G_NOCORPSE)) {
/* beware of random troll or lizard corpse,
or of ordinary one being forced to such */
if (otmp->timed) obj_stop_timers(otmp);
if (mons[mntmp].msound == MS_GUARDIAN)
otmp->corpsenm = genus(mntmp,1);
else
otmp->corpsenm = mntmp;
start_corpse_timeout(otmp);
mntmp = genus(mntmp,1);
set_corpsenm(otmp, mntmp);
}
break;
case FIGURINE:
@@ -2808,13 +2803,8 @@ typfnd:
break;
case EGG:
mntmp = can_be_hatched(mntmp);
if (mntmp != NON_PM) {
otmp->corpsenm = mntmp;
if (!dead_species(mntmp, TRUE))
attach_egg_hatch_timeout(otmp);
else
kill_egg(otmp);
}
/* this also sets hatch timer if appropriate */
set_corpsenm(otmp, mntmp);
break;
case STATUE: otmp->corpsenm = mntmp;
if (Has_contents(otmp) && verysmall(&mons[mntmp]))