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

some restore.c reformatting

Browse Source 
Some reformatting I did while investigating the mimic-as-strange-object
vs protection-from-shape-changers situation.  Not part of the fix for
that and no change in behavior.
This commit is contained in:
PatR
2021-08-24 08:20:18 -07:00
parent e67f45fc5c
commit 52f5e79790
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/restore.c
+17 -13
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 restore.c $NHDT-Date: 1606765214 2020/11/30 19:40:14 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.173 $ */ /* NetHack 3.7 restore.c $NHDT-Date: 1629818407 2021/08/24 15:20:07 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.183 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2009. */ /*-Copyright (c) Michael Allison, 2009. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -335,12 +335,12 @@ restmon(NHFILE* nhfp, struct monst* mtmp)
} }
/* egd - vault guard */ /* egd - vault guard */
if (nhfp->structlevel) if (nhfp->structlevel)
mread(nhfp->fd, (genericptr_t) &buflen, sizeof(buflen)); mread(nhfp->fd, (genericptr_t) &buflen, sizeof buflen);
if (buflen > 0) { if (buflen > 0) {
newegd(mtmp); newegd(mtmp);
if (nhfp->structlevel) if (nhfp->structlevel)
mread(nhfp->fd, (genericptr_t) EGD(mtmp), sizeof(struct egd)); mread(nhfp->fd, (genericptr_t) EGD(mtmp), sizeof (struct egd));
} }
/* epri - temple priest */ /* epri - temple priest */
if (nhfp->structlevel) if (nhfp->structlevel)
@@ -348,7 +348,8 @@ restmon(NHFILE* nhfp, struct monst* mtmp)
if (buflen > 0) { if (buflen > 0) {
newepri(mtmp); newepri(mtmp);
if (nhfp->structlevel) if (nhfp->structlevel)
mread(nhfp->fd, (genericptr_t) EPRI(mtmp), sizeof(struct epri)); mread(nhfp->fd, (genericptr_t) EPRI(mtmp),
sizeof (struct epri));
} }
/* eshk - shopkeeper */ /* eshk - shopkeeper */
if (nhfp->structlevel) if (nhfp->structlevel)
@@ -356,7 +357,8 @@ restmon(NHFILE* nhfp, struct monst* mtmp)
if (buflen > 0) { if (buflen > 0) {
neweshk(mtmp); neweshk(mtmp);
if (nhfp->structlevel) if (nhfp->structlevel)
mread(nhfp->fd, (genericptr_t) ESHK(mtmp), sizeof(struct eshk)); mread(nhfp->fd, (genericptr_t) ESHK(mtmp),
sizeof (struct eshk));
} }
/* emin - minion */ /* emin - minion */
if (nhfp->structlevel) if (nhfp->structlevel)
@@ -364,7 +366,8 @@ restmon(NHFILE* nhfp, struct monst* mtmp)
if (buflen > 0) { if (buflen > 0) {
newemin(mtmp); newemin(mtmp);
if (nhfp->structlevel) if (nhfp->structlevel)
mread(nhfp->fd, (genericptr_t) EMIN(mtmp), sizeof(struct emin)); mread(nhfp->fd, (genericptr_t) EMIN(mtmp),
sizeof (struct emin));
} }
/* edog - pet */ /* edog - pet */
if (nhfp->structlevel) if (nhfp->structlevel)
@@ -372,12 +375,14 @@ restmon(NHFILE* nhfp, struct monst* mtmp)
if (buflen > 0) { if (buflen > 0) {
newedog(mtmp); newedog(mtmp);
if (nhfp->structlevel) if (nhfp->structlevel)
mread(nhfp->fd, (genericptr_t) EDOG(mtmp), sizeof(struct edog)); mread(nhfp->fd, (genericptr_t) EDOG(mtmp),
sizeof (struct edog));
} }
/* mcorpsenm - obj->corpsenm for mimic posing as corpse or /* mcorpsenm - obj->corpsenm for mimic posing as corpse or
statue (inline int rather than pointer to something) */ statue (inline int rather than pointer to something) */
if (nhfp->structlevel) if (nhfp->structlevel)
mread(nhfp->fd, (genericptr_t) &MCORPSENM(mtmp), sizeof MCORPSENM(mtmp)); mread(nhfp->fd, (genericptr_t) &MCORPSENM(mtmp),
sizeof MCORPSENM(mtmp));
} /* mextra */ } /* mextra */
} }
@@ -1122,11 +1127,10 @@ getlev(NHFILE* nhfp, int pid, xchar lev)
/* reset peaceful/malign relative to new character; /* reset peaceful/malign relative to new character;
shopkeepers will reset based on name */ shopkeepers will reset based on name */
if (!mtmp->isshk) if (!mtmp->isshk)
mtmp->mpeaceful = mtmp->mpeaceful = (is_unicorn(mtmp->data)
(is_unicorn(mtmp->data) && (sgn(u.ualign.type)
&& sgn(u.ualign.type) == sgn(mtmp->data->maligntyp)) == sgn(mtmp->data->maligntyp))) ? 1
? TRUE : peace_minded(mtmp->data);
: peace_minded(mtmp->data);
set_malign(mtmp); set_malign(mtmp);
} else if (elapsed > 0L) { } else if (elapsed > 0L) {
mon_catchup_elapsed_time(mtmp, elapsed); mon_catchup_elapsed_time(mtmp, elapsed);