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

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-10-04 09:11:29 -04:00
parent b139d4f869 d9a1bbb203
commit c6a4e8ce50
7 changed files with 1465 additions and 1446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Guidebook.tex
View File

@@ -4790,7 +4790,7 @@ Percentages for ``{\it hitpoints\/}'' and ``{\it power\/}'' are
straightforward; they're based on the corresponding maximum field.
Percentage highlight rules are also allowed for ``{\it experience level\/}''
and ``{\it experience points\/}'' (valid when the
(\it showexp\/}
{\it showexp\/}
option is enabled).
For those, the percentage is based on the progress from the start of
the current experience level to the start of the next level.

2862
doc/Guidebook.txt
View File

File diff suppressed because it is too large Load Diff

8
doc/fixes36.3
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.116 $ $NHDT-Date: 1569276988 2019/09/23 22:16:28 $
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.121 $ $NHDT-Date: 1570142734 2019/10/03 22:45:34 $
This fixes36.3 file is here to capture information about updates in the 3.6.x
lineage following the release of 3.6.2 in May 2019. Please note, however,
@@ -157,6 +157,12 @@ uarmh null pointer dereference if a helm of opposite alignment came off due
verb tense was inappropriate in some messages when a mon/pet had a name
ending in 's'
orctown booty items should have been initialized in mksobj()
query_category() and whatdoes_help() had early returns which could each leave
a temporary window around, which in turn might eventually lead to a
panic due to lack of window slots [probably moot for unmodified 3.6.x;
the query one couldn't happen unless there is a coding error for
object classes somewhere and the help one couldn't happen unless the
installed data files left 'keyhelp' missing]
Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository

4
src/mkmaze.c
View File

@@ -671,7 +671,7 @@ struct monst *mtmp;
goldprob = is_captain ? 600 : 300;
gemprob = goldprob / 4;
if (rn2(1000) < goldprob) {
if ((otmp = mksobj(GOLD_PIECE, FALSE, FALSE)) != 0) {
if ((otmp = mksobj(GOLD_PIECE, TRUE, FALSE)) != 0) {
otmp->quan = 1L + rnd(goldprob);
otmp->owt = weight(otmp);
add_to_minv(mtmp, otmp);
@@ -687,7 +687,7 @@ struct monst *mtmp;
}
if (is_captain || !rn2(8)) {
otyp = shiny_obj(RING_CLASS);
if (otyp != STRANGE_OBJECT && (otmp = mksobj(otyp, FALSE, FALSE)) != 0)
if (otyp != STRANGE_OBJECT && (otmp = mksobj(otyp, TRUE, FALSE)) != 0)
add_to_minv(mtmp, otmp);
}
}

5
src/pager.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 pager.c $NHDT-Date: 1562632673 2019/07/09 00:37:53 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.154 $ */
/* NetHack 3.6 pager.c $NHDT-Date: 1570142734 2019/10/03 22:45:34 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.156 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2018. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1575,7 +1575,7 @@ whatdoes_help()
{
dlb *fp;
char *p, buf[BUFSZ];
winid tmpwin = create_nhwindow(NHW_TEXT);
winid tmpwin;
fp = dlb_fopen(KEYHELP, "r");
if (!fp) {
@@ -1583,6 +1583,7 @@ whatdoes_help()
display_nhwindow(WIN_MESSAGE, TRUE);
return;
}
tmpwin = create_nhwindow(NHW_TEXT);
while (dlb_fgets(buf, (int) sizeof buf, fp)) {
if (*buf == '#')
continue;

12
src/pickup.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 pickup.c $NHDT-Date: 1562203851 2019/07/04 01:30:51 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.229 $ */
/* NetHack 3.6 pickup.c $NHDT-Date: 1570142736 2019/10/03 22:45:36 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.234 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1051,11 +1051,13 @@ int how; /* type of query */
if (curr) {
*pick_list = (menu_item *) alloc(sizeof(menu_item));
(*pick_list)->item.a_int = curr->oclass;
return 1;
n = 1;
} else {
debugpline0("query_category: no single object match");
n = 0;
}
return 0;
/* early return is ok; there's no temp window yet */
return n;
}
win = create_nhwindow(NHW_MENU);
@@ -1108,7 +1110,8 @@ int how; /* type of query */
pack++;
if (invlet >= 'u') {
impossible("query_category: too many categories");
return 0;
n = 0;
goto query_done;
}
} while (*pack);
@@ -1168,6 +1171,7 @@ int how; /* type of query */
}
end_menu(win, qstr);
n = select_menu(win, how, pick_list);
query_done:
destroy_nhwindow(win);
if (n < 0)
n = 0; /* caller's don't expect -1 */

18
sys/unix/README.linux
View File

@@ -61,7 +61,15 @@ If you have problems, send us some email.
nethack-bugs@nethack.org
Recommended steps:
1. cd sys/unix
2. sh setup.sh hints/linux
3. cd ../..
4. make all; su; make install
The older instructions are retained below...
Steps used to build this binary release, in addition to the basic
instructions found in sys/unix/Install.unx. The step numbers below
@@ -69,7 +77,7 @@ correspond to the step numbers in sys/unix/Install.unx.
System: gcc-3.2, XFree86-libs-4.2.1, ncurses-5.2, glibc-2.3.2 (GLIBC_2.3)
3. Edit include/config.h and include/unixconf.h
1. Edit include/config.h and include/unixconf.h
config.h: define X11_GRAPHICS window support.
define USE_XPM support.
define COMPRESS as /bin/gzip as that is where it
@@ -80,12 +88,12 @@ System: gcc-3.2, XFree86-libs-4.2.1, ncurses-5.2, glibc-2.3.2 (GLIBC_2.3)
unixconf.h: define LINUX
define TIMED_DELAY
6. Makefile.src: define modern, non-BSD Linux and linux options throughout
2. Makefile.src: define modern, non-BSD Linux and linux options throughout
CC = gcc
LFLAGS = -L/usr/X11R6/lib
WINSRC = $(WINTTYSRC) $(WINX11SRC)
WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
WINTTYLIB = /usr/lib/libncurses.a
WINTTYLIB = -lncurses
WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11
WINLIB = $(WINTTYLIB) $(WINX11LIB)
@@ -96,7 +104,7 @@ System: gcc-3.2, XFree86-libs-4.2.1, ncurses-5.2, glibc-2.3.2 (GLIBC_2.3)
YACC = bison -y
LEX = flex
7. Makefile.top: GAMEGRP = games
3. Makefile.top: GAMEGRP = games
GAMEPERM = 02755
FILEPERM = 0664
EXEPERM = 0755
@@ -105,5 +113,5 @@ System: gcc-3.2, XFree86-libs-4.2.1, ncurses-5.2, glibc-2.3.2 (GLIBC_2.3)
make all; su; make install
9. Additional step: As discussed in win/X11/Install.X11, convert nh10.bdf
4. Additional step: As discussed in win/X11/Install.X11, convert nh10.bdf
and ibm.bdf to proper font files and place in font path.