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

Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01

Browse Source
This commit is contained in:
nhmall
2018-12-07 09:40:38 -05:00
parent a1c1acdd24 f3c4a52e36
commit 89d165b501
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes36.2
+3
View File
@@ -252,6 +252,9 @@ hero hit by something that causes inventory items to be destroyed with loss of
similar problem with more obvious symptom, an "object lost" panic when similar problem with more obvious symptom, an "object lost" panic when
the unholy water was wielded; the fix for that wasn't general enough] the unholy water was wielded; the fix for that wasn't general enough]
add MM_ASLEEP makemon() flag and honor it when creating group for fill_zoo add MM_ASLEEP makemon() flag and honor it when creating group for fill_zoo
at start of session (new game or restore), HILITE_STATUS for gold was ignored
if player creates any menu colors via 'O' while menucolors is off, issue a
reminder that it needs to be on in order for those to become effective
add MM_NOGRP makemon() flag as a means of suppressing groups of monsters in add MM_NOGRP makemon() flag as a means of suppressing groups of monsters in
a couple places that warrant it when a specific monster type isn't a couple places that warrant it when a specific monster type isn't
specified on the call to makemon() specified on the call to makemon()
src/botl.c
+6 -7
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 botl.c $NHDT-Date: 1527042178 2018/05/23 02:22:58 $ $NHDT-Branch: NetHack-3.6.2 $:$NHDT-Revision: 1.101 $ */ /* NetHack 3.6 botl.c $NHDT-Date: 1544171789 2018/12/07 08:36:29 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.128 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2006. */ /*-Copyright (c) Michael Allison, 2006. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -732,15 +732,14 @@ boolean *valsetlist;
* NNNN = the glyph portion * NNNN = the glyph portion
* 25 = the gold amount * 25 = the gold amount
* *
* Setting 'chg = 2' is enough to render the field properly, but
* not to honor an initial highlight, so force 'update_all = 1'.
*/ */
if (fld == BL_GOLD) { if (fld == BL_GOLD) {
if (context.rndencode != oldrndencode) { if (context.rndencode != oldrndencode
chg = 2; || showsyms[COIN_CLASS + SYM_OFF_O] != oldgoldsym) {
update_all = 1; /* chg = 2; */
oldrndencode = context.rndencode; oldrndencode = context.rndencode;
}
if (oldgoldsym != showsyms[COIN_CLASS + SYM_OFF_O]) {
chg = 2;
oldgoldsym = showsyms[COIN_CLASS + SYM_OFF_O]; oldgoldsym = showsyms[COIN_CLASS + SYM_OFF_O];
} }
} }
src/options.c
+9 -5
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 options.c $NHDT-Date: 1543972192 2018/12/05 01:09:52 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.335 $ */ /* NetHack 3.6 options.c $NHDT-Date: 1544174413 2018/12/07 09:20:13 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.339 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2008. */ /*-Copyright (c) Michael Allison, 2008. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -4283,7 +4283,7 @@ static struct other_opts {
int NDECL((*othr_count_func)); int NDECL((*othr_count_func));
} othropt[] = { } othropt[] = {
{ "autopickup exceptions", SET_IN_GAME, OPT_OTHER_APEXC, count_apes }, { "autopickup exceptions", SET_IN_GAME, OPT_OTHER_APEXC, count_apes },
{ "menucolors", SET_IN_GAME, OPT_OTHER_MENUCOLOR, count_menucolors }, { "menu colors", SET_IN_GAME, OPT_OTHER_MENUCOLOR, count_menucolors },
{ "message types", SET_IN_GAME, OPT_OTHER_MSGTYPE, msgtype_count }, { "message types", SET_IN_GAME, OPT_OTHER_MSGTYPE, msgtype_count },
#ifdef STATUS_HILITES #ifdef STATUS_HILITES
{ "status hilite rules", SET_IN_GAME, OPT_OTHER_STATHILITE, { "status hilite rules", SET_IN_GAME, OPT_OTHER_STATHILITE,
@@ -4457,7 +4457,7 @@ doset() /* changing options via menu by Per Liboriussen */
} }
#endif #endif
} else if (opt_indx == OPT_OTHER_MENUCOLOR) { } else if (opt_indx == OPT_OTHER_MENUCOLOR) {
(void) special_handling("menucolors", setinitial, (void) special_handling("menu_colors", setinitial,
fromfile); fromfile);
} else if (opt_indx == OPT_OTHER_MSGTYPE) { } else if (opt_indx == OPT_OTHER_MSGTYPE) {
(void) special_handling("msgtype", setinitial, fromfile); (void) special_handling("msgtype", setinitial, fromfile);
@@ -5036,7 +5036,7 @@ boolean setinitial, setfromfile;
if (pick_cnt >= 0) if (pick_cnt >= 0)
goto msgtypes_again; goto msgtypes_again;
} }
} else if (!strcmp("menucolors", optname)) { } else if (!strcmp("menu_colors", optname)) {
int opt_idx, nmc, mcclr, mcattr; int opt_idx, nmc, mcclr, mcattr;
char mcbuf[BUFSZ] = DUMMY; char mcbuf[BUFSZ] = DUMMY;
@@ -5044,11 +5044,15 @@ boolean setinitial, setfromfile;
nmc = count_menucolors(); nmc = count_menucolors();
opt_idx = handle_add_list_remove("menucolor", nmc); opt_idx = handle_add_list_remove("menucolor", nmc);
if (opt_idx == 3) { /* done */ if (opt_idx == 3) { /* done */
menucolors_done:
if (nmc > 0 && !iflags.use_menu_color)
pline(
"To have menu colors become active, toggle 'menucolors' option to True.");
return TRUE; return TRUE;
} else if (opt_idx == 0) { /* add new */ } else if (opt_idx == 0) { /* add new */
getlin("What new menucolor pattern?", mcbuf); getlin("What new menucolor pattern?", mcbuf);
if (*mcbuf == '\033') if (*mcbuf == '\033')
return TRUE; goto menucolors_done;
if (*mcbuf if (*mcbuf
&& test_regex_pattern(mcbuf, (const char *)0) && test_regex_pattern(mcbuf, (const char *)0)
&& (mcclr = query_color((char *) 0)) != -1 && (mcclr = query_color((char *) 0)) != -1