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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-01-21 06:47:42 -05:00
parent 28ac8090f9 b5504c27e0
commit 00f2feb83d
4 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes36.2
View File

@@ -342,6 +342,7 @@ the simulation of dual weapon combat when polymorphed into a form with more
used seconary weapon even when wearing a shield, or if it was silver used seconary weapon even when wearing a shield, or if it was silver
even when current shape couldn't handle silver, or if it was cursed; even when current shape couldn't handle silver, or if it was cursed;
cursed is allowed but weapon will be dropped, just like in two-weapon cursed is allowed but weapon will be dropped, just like in two-weapon
demons gated in other demons without any message
Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository

2
src/minion.c
View File

@@ -143,6 +143,8 @@ struct monst *mon;
EMIN(mtmp)->renegade = EMIN(mtmp)->renegade =
(atyp != u.ualign.type) ^ !mtmp->mpeaceful; (atyp != u.ualign.type) ^ !mtmp->mpeaceful;
} }
if (is_demon(ptr) && canseemon(mtmp))
pline("%s appears in a cloud of smoke!", Amonnam(mtmp));
} }
cnt--; cnt--;
} }

2
src/save.c
View File

@@ -1236,6 +1236,8 @@ int fd, mode;
while ((msg = getmsghistory(init)) != 0) { while ((msg = getmsghistory(init)) != 0) {
init = FALSE; init = FALSE;
msglen = strlen(msg); msglen = strlen(msg);
if (msglen < 1)
continue;
/* sanity: truncate if necessary (shouldn't happen); /* sanity: truncate if necessary (shouldn't happen);
no need to modify msg[] since terminator isn't written */ no need to modify msg[] since terminator isn't written */
if (msglen > BUFSZ - 1) if (msglen > BUFSZ - 1)

2
sys/winnt/windmain.c
View File

@@ -32,8 +32,8 @@ E void NDECL(mswin_destroy_reg);
#endif #endif
#ifdef TTY_GRAPHICS #ifdef TTY_GRAPHICS
extern void NDECL(backsp); extern void NDECL(backsp);
extern void NDECL(clear_screen);
#endif #endif
extern void NDECL(clear_screen);
#undef E #undef E
#ifdef PC_LOCKING #ifdef PC_LOCKING