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

fix build order for nhdefkey, add to nhsetup

Browse Source 
also minor cosmetics; clean up two warnings in Release mode,
turn off multi-processor, and fix /Oi /Oi- discrepancy
This commit is contained in:
Derek S. Ray
2015-02-28 21:34:34 -05:00
parent 4794329e89
commit 6ebb7db138
7 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/hack.c
View File

@@ -1099,7 +1099,7 @@ domove()
register struct monst *mtmp;
register struct rm *tmpr;
register xchar x,y;
struct trap *trap;
struct trap *trap = NULL;
int wtcap;
boolean on_ice;
xchar chainx, chainy, ballx, bally; /* ball&chain new positions */

18
src/read.c
View File

@@ -2031,7 +2031,7 @@ create_particular()
{
char buf[BUFSZ], *bufp, monclass;
int which, tryct, i, firstchoice = NON_PM;
struct permonst *whichpm;
struct permonst *whichpm = NULL;
struct monst *mtmp;
boolean madeany = FALSE;
boolean maketame, makepeaceful, makehostile;
@@ -2080,14 +2080,14 @@ create_particular()
pline1(thats_enough_tries);
} else {
if (!randmonst) {
firstchoice = which;
if (cant_revive(&which, FALSE, (struct obj *)0)) {
/* wizard mode can override handling of special monsters */
Sprintf(buf, "Creating %s instead; force %s?",
mons[which].mname, mons[firstchoice].mname);
if (yn(buf) == 'y') which = firstchoice;
}
whichpm = &mons[which];
firstchoice = which;
if (cant_revive(&which, FALSE, (struct obj *)0)) {
/* wizard mode can override handling of special monsters */
Sprintf(buf, "Creating %s instead; force %s?",
mons[which].mname, mons[firstchoice].mname);
if (yn(buf) == 'y') which = firstchoice;
}
whichpm = &mons[which];
}
for (i = 0; i <= multi; i++) {
if (monclass != MAXMCLASSES)