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

Merge branch 'NetHack-3.7'

Browse Source
This commit is contained in:
nhmall
2019-11-27 23:07:50 -05:00
parent 5847806104 4b558bf94e
commit 11ec453329
7 changed files with 210 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dog.c
View File

@@ -417,7 +417,7 @@ boolean with_you;
break;
}
if ((mtmp->mspare1 & MIGR_LEFTOVERS) != 0L) {
if ((mtmp->migflags & MIGR_LEFTOVERS) != 0L) {
/* Pick up the rest of the MIGR_TO_SPECIES objects */
if (g.migrating_objs)
deliver_obj_to_mon(mtmp, 0, DF_ALL);

4
src/mkmaze.c
View File

@@ -646,14 +646,14 @@ unsigned long mflags;
/* once in a blue moon, he won't be at the very bottom */
if (!rn2(40))
nlev--;
mtmp->mspare1 |= MIGR_LEFTOVERS;
mtmp->migflags |= MIGR_LEFTOVERS;
} else {
nlev = rn2((max_depth - cur_depth) + 1) + cur_depth;
if (nlev == cur_depth)
nlev++;
if (nlev > max_depth)
nlev = max_depth;
mtmp->mspare1 = (mtmp->mspare1 & ~MIGR_LEFTOVERS);
mtmp->migflags = (mtmp->migflags & ~MIGR_LEFTOVERS);
}
get_level(&dest, nlev);
migrate_to_level(mtmp, ledger_no(&dest), MIGR_RANDOM, (coord *) 0);

2
src/sfascii.c
View File

@@ -6,7 +6,7 @@
#include "integer.h"
#include "sfprocs.h"
#ifdef MACOSX
#if defined(MACOSX) || defined(VMS)
extern long long FDECL(atoll, (const char *));
#endif

6
src/sfdata.c
View File

@@ -1258,6 +1258,8 @@ int cnt;
sfo_ulong(nhfp, &d_monst->mstrategy, parent, "mstrategy", 1);/* (unsigned long) */
sfo_long(nhfp, &d_monst->mtrapseen, parent, "mtrapseen", 1); /* (long) */
sfo_long(nhfp, &d_monst->mlstmv, parent, "mlstmv", 1); /* (long) */
sfo_long(nhfp, &d_monst->mstate, parent, "mstate", 1); /* (long) */
sfo_long(nhfp, &d_monst->migflags, parent, "migflags", 1); /* (long) */
sfo_long(nhfp, &d_monst->mspare1, parent, "mspare1", 1); /* (long) */
sfo_genericptr(nhfp, (genericptr_t) &d_monst->minvent, parent, "minvent", 1);/* (struct obj *) */
sfo_genericptr(nhfp, (genericptr_t) &d_monst->mw, parent, "mw", 1);/* (struct obj *) */
@@ -3814,6 +3816,8 @@ int cnt;
sfi_ulong(nhfp, &d_monst->mstrategy, parent, "mstrategy", 1);
sfi_long(nhfp, &d_monst->mtrapseen, parent, "mtrapseen", 1);
sfi_long(nhfp, &d_monst->mlstmv, parent, "mlstmv", 1);
sfi_long(nhfp, &d_monst->mstate, parent, "mstate", 1);
sfi_long(nhfp, &d_monst->migflags, parent, "migflags", 1);
sfi_long(nhfp, &d_monst->mspare1, parent, "mspare1", 1);
sfi_genericptr(nhfp, (genericptr_t) &d_monst->minvent, parent, "minvent", 1);
sfi_genericptr(nhfp, (genericptr_t) &d_monst->mw, parent, "mw", 1);
@@ -5682,6 +5686,8 @@ const char *critical_members[] = {
"struct monst:mstrategy:unsigned long",
"struct monst:mtrapseen:long",
"struct monst:mlstmv:long",
"struct monst:mstate:long",
"struct monst:migflags:long",
"struct monst:mspare1:long",
"struct monst:minvent:struct obj *",
"struct monst:mw:struct obj *",