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

Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2

Browse Source
This commit is contained in:
nhmall
2018-12-30 08:01:30 -05:00
parent 367ad8de51 83e8033f72
commit 31c4a3fca4
11 changed files with 145 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/fixes36.2
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: $:$NHDT-Revision: $ $NHDT-Date: $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.218 $ $NHDT-Date: 1546144745 2018/12/30 04:39:05 $
This fixes36.2 file is here to capture information about updates in the 3.6.x This fixes36.2 file is here to capture information about updates in the 3.6.x
lineage following the release of 3.6.1 in April 2018. Please note, however, lineage following the release of 3.6.1 in April 2018. Please note, however,
@@ -357,6 +357,10 @@ when built with STATUS_HILITES enabled (the default), gold on status line
was missing '$' prefix for symset:Blank was missing '$' prefix for symset:Blank
wizard mode ^G, creating a monster of class 'I' yielded impossible "mkclass wizard mode ^G, creating a monster of class 'I' yielded impossible "mkclass
found no class 35 monsters" found no class 35 monsters"
in some unknown circumstance, examining something on the map could match bogus
monster class #0 and trigger impossible "Alphabet soup: 'an("")'."
(fix avoids the warning but underlying cause is a mystery; noticed
with the fuzzer, which swaps symbol sets in and out at random)
tty: turn off an optimization that is the suspected cause of Windows reported tty: turn off an optimization that is the suspected cause of Windows reported
partial status lines following level changes partial status lines following level changes
tty: ensure that current status fields are always copied to prior status tty: ensure that current status fields are always copied to prior status

29
src/files.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 files.c $NHDT-Date: 1545702598 2018/12/25 01:49:58 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.248 $ */ /* NetHack 3.6 files.c $NHDT-Date: 1546144856 2018/12/30 04:40:56 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.249 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */ /*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -3264,37 +3264,26 @@ int which_set;
switch (symp->idx) { switch (symp->idx) {
case 0: case 0:
tmpsp = tmpsp = (struct symsetentry *) alloc(sizeof *tmpsp);
(struct symsetentry *) alloc(sizeof (struct symsetentry)); tmpsp->next = symset_list;
tmpsp->next = (struct symsetentry *) 0; symset_list = tmpsp;
if (!symset_list) { tmpsp->idx = symset_count++;
symset_list = tmpsp;
symset_count = 0;
} else {
symset_count++;
tmpsp->next = symset_list;
symset_list = tmpsp;
}
tmpsp->idx = symset_count;
tmpsp->name = dupstr(bufp); tmpsp->name = dupstr(bufp);
tmpsp->desc = (char *) 0; tmpsp->desc = (char *) 0;
tmpsp->nocolor = 0; tmpsp->handling = H_UNK;
/* initialize restriction bits */ /* initialize restriction bits */
tmpsp->nocolor = 0;
tmpsp->primary = 0; tmpsp->primary = 0;
tmpsp->rogue = 0; tmpsp->rogue = 0;
break; break;
case 2: case 2:
/* handler type identified */ /* handler type identified */
tmpsp = symset_list; /* most recent symset */ tmpsp = symset_list; /* most recent symset */
tmpsp->handling = H_UNK; for (i = 0; known_handling[i]; ++i)
i = 0;
while (known_handling[i]) {
if (!strcmpi(known_handling[i], bufp)) { if (!strcmpi(known_handling[i], bufp)) {
tmpsp->handling = i; tmpsp->handling = i;
break; /* while loop */ break; /* for loop */
} }
i++;
}
break; break;
case 3: /* description:something */ case 3: /* description:something */
tmpsp = symset_list; /* most recent symset */ tmpsp = symset_list; /* most recent symset */

106
src/options.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 options.c $NHDT-Date: 1544773907 2018/12/14 07:51:47 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.347 $ */ /* NetHack 3.6 options.c $NHDT-Date: 1546144857 2018/12/30 04:40:57 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.349 $ */
/* 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. */
@@ -5201,8 +5201,7 @@ boolean setinitial, setfromfile;
} else if (!strcmp("symset", optname) } else if (!strcmp("symset", optname)
|| !strcmp("roguesymset", optname)) { || !strcmp("roguesymset", optname)) {
menu_item *symset_pick = (menu_item *) 0; menu_item *symset_pick = (menu_item *) 0;
boolean primaryflag = (*optname == 's'), boolean rogueflag = (*optname == 'r'),
rogueflag = (*optname == 'r'),
ready_to_switch = FALSE, ready_to_switch = FALSE,
nothing_to_do = FALSE; nothing_to_do = FALSE;
char *symset_name, fmtstr[20]; char *symset_name, fmtstr[20];
@@ -5210,37 +5209,33 @@ boolean setinitial, setfromfile;
int res, which_set, setcount = 0, chosen = -2; int res, which_set, setcount = 0, chosen = -2;
which_set = rogueflag ? ROGUESET : PRIMARY; which_set = rogueflag ? ROGUESET : PRIMARY;
symset_list = (struct symsetentry *) 0;
/* clear symset[].name as a flag to read_sym_file() to build list */ /* clear symset[].name as a flag to read_sym_file() to build list */
symset_name = symset[which_set].name; symset_name = symset[which_set].name;
symset[which_set].name = (char *) 0; symset[which_set].name = (char *) 0;
symset_list = (struct symsetentry *) 0;
res = read_sym_file(which_set); res = read_sym_file(which_set);
if (res && symset_list) {
char symsetchoice[BUFSZ];
int let = 'a', biggest = 0, thissize = 0;
sl = symset_list; /* put symset name back */
while (sl) { symset[which_set].name = symset_name;
if (res && symset_list) {
int thissize, biggest = 0;
for (sl = symset_list; sl; sl = sl->next) {
/* check restrictions */ /* check restrictions */
if ((!rogueflag && sl->rogue) if (rogueflag ? sl->primary : sl->rogue)
|| (!primaryflag && sl->primary)) {
sl = sl->next;
continue; continue;
}
setcount++; setcount++;
/* find biggest name */ /* find biggest name */
if (sl->name) thissize = sl->name ? (int) strlen(sl->name) : 0;
thissize = strlen(sl->name);
if (thissize > biggest) if (thissize > biggest)
biggest = thissize; biggest = thissize;
sl = sl->next;
} }
if (!setcount) { if (!setcount) {
pline("There are no appropriate %ssymbol sets available.", pline("There are no appropriate %s symbol sets available.",
(rogueflag) ? "rogue level " rogueflag ? "rogue level" : "primary");
: (primaryflag) ? "primary " : "");
return TRUE; return TRUE;
} }
@@ -5249,29 +5244,20 @@ boolean setinitial, setfromfile;
start_menu(tmpwin); start_menu(tmpwin);
any = zeroany; any = zeroany;
any.a_int = 1; any.a_int = 1;
add_menu(tmpwin, NO_GLYPH, &any, let++, 0, ATR_NONE, add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
"Default Symbols", MENU_UNSELECTED); "Default Symbols", MENU_UNSELECTED);
sl = symset_list; for (sl = symset_list; sl; sl = sl->next) {
while (sl) {
/* check restrictions */ /* check restrictions */
if ((!rogueflag && sl->rogue) if (rogueflag ? sl->primary : sl->rogue)
|| (!primaryflag && sl->primary)) {
sl = sl->next;
continue; continue;
}
if (sl->name) { if (sl->name) {
any.a_int = sl->idx + 2; any.a_int = sl->idx + 2;
Sprintf(symsetchoice, fmtstr, sl->name, Sprintf(buf, fmtstr, sl->name, sl->desc ? sl->desc : "");
sl->desc ? sl->desc : ""); add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
add_menu(tmpwin, NO_GLYPH, &any, let, 0, ATR_NONE, buf, MENU_UNSELECTED);
symsetchoice, MENU_UNSELECTED);
if (let == 'z')
let = 'A';
else
let++;
} }
sl = sl->next;
} }
Sprintf(buf, "Select %ssymbol set:", Sprintf(buf, "Select %ssymbol set:",
rogueflag ? "rogue level " : ""); rogueflag ? "rogue level " : "");
@@ -5284,30 +5270,20 @@ boolean setinitial, setfromfile;
if (chosen > -1) { if (chosen > -1) {
/* chose an actual symset name from file */ /* chose an actual symset name from file */
sl = symset_list; for (sl = symset_list; sl; sl = sl->next)
while (sl) { if (sl->idx == chosen)
if (sl->idx == chosen) {
if (symset_name) {
free((genericptr_t) symset_name);
symset_name = (char *) 0;
}
/* free the now stale attributes */
clear_symsetentry(which_set, TRUE);
/* transfer only the name of the symbol set */
symset[which_set].name = dupstr(sl->name);
ready_to_switch = TRUE;
break; break;
} if (sl) {
sl = sl->next; /* free the now stale attributes */
clear_symsetentry(which_set, TRUE);
/* transfer only the name of the symbol set */
symset[which_set].name = dupstr(sl->name);
ready_to_switch = TRUE;
} }
} else if (chosen == -1) { } else if (chosen == -1) {
/* explicit selection of defaults */ /* explicit selection of defaults */
/* free the now stale symset attributes */ /* free the now stale symset attributes */
if (symset_name) {
free((genericptr_t) symset_name);
symset_name = (char *) 0;
}
clear_symsetentry(which_set, TRUE); clear_symsetentry(which_set, TRUE);
} else } else
nothing_to_do = TRUE; nothing_to_do = TRUE;
@@ -5322,26 +5298,18 @@ boolean setinitial, setfromfile;
} }
/* clean up */ /* clean up */
while (symset_list) { while ((sl = symset_list) != 0) {
sl = symset_list;
if (sl->name)
free((genericptr_t) sl->name);
sl->name = (char *) 0;
if (sl->desc)
free((genericptr_t) sl->desc);
sl->desc = (char *) 0;
symset_list = sl->next; symset_list = sl->next;
if (sl->name)
free((genericptr_t) sl->name), sl->name = (char *) 0;
if (sl->desc)
free((genericptr_t) sl->desc), sl->desc = (char *) 0;
free((genericptr_t) sl); free((genericptr_t) sl);
} }
if (nothing_to_do) if (nothing_to_do)
return TRUE; return TRUE;
if (!symset[which_set].name && symset_name)
symset[which_set].name = symset_name; /* not dupstr() here */
/* Set default symbols and clear the handling value */ /* Set default symbols and clear the handling value */
if (rogueflag) if (rogueflag)
init_r_symbols(); init_r_symbols();
@@ -5349,6 +5317,7 @@ boolean setinitial, setfromfile;
init_l_symbols(); init_l_symbols();
if (symset[which_set].name) { if (symset[which_set].name) {
/* non-default symbols */
if (read_sym_file(which_set)) { if (read_sym_file(which_set)) {
ready_to_switch = TRUE; ready_to_switch = TRUE;
} else { } else {
@@ -5367,7 +5336,6 @@ boolean setinitial, setfromfile;
assign_graphics(PRIMARY); assign_graphics(PRIMARY);
preference_update("symset"); preference_update("symset");
need_redraw = TRUE; need_redraw = TRUE;
return TRUE;
} else { } else {
/* didn't match any of the special options */ /* didn't match any of the special options */

8
src/pager.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 pager.c $NHDT-Date: 1545774524 2018/12/25 21:48:44 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.145 $ */ /* NetHack 3.6 pager.c $NHDT-Date: 1546144745 2018/12/30 04:39:05 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.146 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2018. */ /*-Copyright (c) Robert Patrick Rankin, 2018. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -861,9 +861,9 @@ struct permonst **for_supplement;
/* Check for monsters */ /* Check for monsters */
if (!iflags.terrainmode || (iflags.terrainmode & TER_MON) != 0) { if (!iflags.terrainmode || (iflags.terrainmode & TER_MON) != 0) {
for (i = 0; i < MAXMCLASSES; i++) { for (i = 1; i < MAXMCLASSES; i++) {
if (sym == (looked ? showsyms[i + SYM_OFF_M] : def_monsyms[i].sym) if (sym == (looked ? showsyms[i + SYM_OFF_M] : def_monsyms[i].sym)
&& def_monsyms[i].explain) { && def_monsyms[i].explain && *def_monsyms[i].explain) {
need_to_look = TRUE; need_to_look = TRUE;
if (!found) { if (!found) {
Sprintf(out_str, "%s%s", Sprintf(out_str, "%s%s",
@@ -1235,7 +1235,7 @@ coord *click_cc;
} }
found = do_screen_description(cc, (from_screen || clicklook), sym, found = do_screen_description(cc, (from_screen || clicklook), sym,
out_str, &firstmatch, &supplemental_pm); out_str, &firstmatch, &supplemental_pm);
/* Finally, print out our explanation. */ /* Finally, print out our explanation. */
if (found) { if (found) {

9
src/role.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 role.c $NHDT-Date: 1463561393 2016/05/18 08:49:53 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.38 $ */ /* NetHack 3.6 role.c $NHDT-Date: 1546137492 2018/12/30 02:38:12 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.55 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985-1999. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985-1999. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1631,13 +1631,16 @@ int buflen, rolenum, racenum, gendnum, alignnum;
Strcpy(tmpbuf, "Shall I pick "); Strcpy(tmpbuf, "Shall I pick ");
if (racenum != ROLE_NONE || validrole(rolenum)) if (racenum != ROLE_NONE || validrole(rolenum))
Strcat(tmpbuf, "your "); Strcat(tmpbuf, "your ");
else { else
Strcat(tmpbuf, "a "); Strcat(tmpbuf, "a ");
}
/* <your> */ /* <your> */
(void) root_plselection_prompt(eos(tmpbuf), buflen - strlen(tmpbuf), (void) root_plselection_prompt(eos(tmpbuf), buflen - strlen(tmpbuf),
rolenum, racenum, gendnum, alignnum); rolenum, racenum, gendnum, alignnum);
/* "Shall I pick a character's role, race, gender, and alignment for you?"
plus " [ynaq] (y)" is a little too long for a conventional 80 columns;
also, "pick a character's <anything>" sounds a bit stilted */
strsubst(tmpbuf, "pick a character", "pick character");
Sprintf(buf, "%s", s_suffix(tmpbuf)); Sprintf(buf, "%s", s_suffix(tmpbuf));
/* don't bother splitting caveman/cavewoman or priest/priestess /* don't bother splitting caveman/cavewoman or priest/priestess
in order to apply possessive suffix to both halves, but do in order to apply possessive suffix to both halves, but do

5
src/version.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 version.c $NHDT-Date: 1524693365 2018/04/25 21:56:05 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.49 $ */ /* NetHack 3.6 version.c $NHDT-Date: 1546137502 2018/12/30 02:38:22 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.51 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2018. */ /*-Copyright (c) Michael Allison, 2018. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -68,7 +68,8 @@ char *buf;
#if defined(NETHACK_GIT_BRANCH) #if defined(NETHACK_GIT_BRANCH)
#if defined(BETA) #if defined(BETA)
if (NetHack_git_branch) if (NetHack_git_branch)
Sprintf(eos(buf), "%sbranch:%s", c++ ? "," : "", NetHack_git_branch); Sprintf(eos(buf), "%sbranch:%s",
c++ ? "," : "", NetHack_git_branch);
#endif #endif
#endif #endif
Sprintf(eos(buf), ")"); Sprintf(eos(buf), ")");

4
sys/unix/Makefile.src
View File

@@ -1,5 +1,5 @@
# NetHack Makefile. # NetHack Makefile.
# NetHack 3.6 Makefile.src $NHDT-Date: 1543447374 2018/11/28 23:22:54 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.60 $ # NetHack 3.6 Makefile.src $NHDT-Date: 1546137503 2018/12/30 02:38:23 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.66 $
# Copyright (c) 2018 by Pasi Kallinen # Copyright (c) 2018 by Pasi Kallinen
# NetHack may be freely redistributed. See license for details. # NetHack may be freely redistributed. See license for details.
@@ -790,7 +790,7 @@ cursstat.o: ../win/curses/cursstat.c $(HACK_H) ../include/wincurs.h \
../win/curses/cursstat.h ../win/curses/cursstat.h
$(CC) $(CFLAGS) -c ../win/curses/cursstat.c $(CC) $(CFLAGS) -c ../win/curses/cursstat.c
cursinit.o: ../win/curses/cursinit.c $(HACK_H) ../include/wincurs.h \ cursinit.o: ../win/curses/cursinit.c $(HACK_H) ../include/wincurs.h \
../win/curses/cursinit.h ../include/patchlevel.h ../include/date.h ../win/curses/cursinit.h
$(CC) $(CFLAGS) -c ../win/curses/cursinit.c $(CC) $(CFLAGS) -c ../win/curses/cursinit.c
cursmesg.o: ../win/curses/cursmesg.c $(HACK_H) ../include/wincurs.h \ cursmesg.o: ../win/curses/cursmesg.c $(HACK_H) ../include/wincurs.h \
../win/curses/cursmesg.h ../win/curses/cursmesg.h

4
sys/winnt/Makefile.gcc
View File

@@ -1,4 +1,4 @@
# NetHack 3.6 Makefile.gcc $NHDT-Date: 1546018468 2018/12/28 17:34:28 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.69 $ # NetHack 3.6 Makefile.gcc $NHDT-Date: 1546174698 2018/12/30 12:58:18 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.71 $
# Copyright (c) 2010 by Michael Allison # Copyright (c) 2010 by Michael Allison
# NetHack may be freely redistributed. See license for details. # NetHack may be freely redistributed. See license for details.
# #
@@ -1454,7 +1454,7 @@ $(O)panic.o: $(U)panic.c $(CONFIG_H)
ifeq "$(ADD_CURSES)" "Y" ifeq "$(ADD_CURSES)" "Y"
# curses window port dependencies # curses window port dependencies
$(O)cursdial.o: $(WCURSES)/cursdial.c $(WCURSES)/cursdial.h $(INCL)/wincurs.h $(O)cursdial.o: $(WCURSES)/cursdial.c $(WCURSES)/cursdial.h $(INCL)/wincurs.h
$(O)cursinit.o: $(WCURSES)/cursinit.c $(WCURSES)/cursinit.h $(INCL)/wincurs.h $(INCL)/date.h $(O)cursinit.o: $(WCURSES)/cursinit.c $(WCURSES)/cursinit.h $(INCL)/wincurs.h
$(O)cursinvt.o: $(WCURSES)/cursinvt.c $(WCURSES)/cursinvt.h $(INCL)/wincurs.h $(O)cursinvt.o: $(WCURSES)/cursinvt.c $(WCURSES)/cursinvt.h $(INCL)/wincurs.h
$(O)cursmain.o: $(WCURSES)/cursmain.c $(INCL)/wincurs.h $(O)cursmain.o: $(WCURSES)/cursmain.c $(INCL)/wincurs.h
$(O)cursmesg.o: $(WCURSES)/cursmesg.c $(WCURSES)/cursmesg.h $(INCL)/wincurs.h $(O)cursmesg.o: $(WCURSES)/cursmesg.c $(WCURSES)/cursmesg.h $(INCL)/wincurs.h

4
sys/winnt/Makefile.msc
View File

@@ -1,4 +1,4 @@
# NetHack 3.6 Makefile.msc $NHDT-Date: 1546018476 2018/12/28 17:34:36 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.145 $ */ # NetHack 3.6 Makefile.msc $NHDT-Date: 1546174708 2018/12/30 12:58:28 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.147 $ */
# Copyright (c) NetHack PC Development Team 1993-2018 # Copyright (c) NetHack PC Development Team 1993-2018
# #
#============================================================================== #==============================================================================
@@ -1489,7 +1489,7 @@ $(O)panic.o: $(U)panic.c $(CONFIG_H)
# curses window port dependencies # curses window port dependencies
# #
$(O)cursdial.o: $(WCURSES)\cursdial.c $(WCURSES)\cursdial.h $(INCL)\wincurs.h $(O)cursdial.o: $(WCURSES)\cursdial.c $(WCURSES)\cursdial.h $(INCL)\wincurs.h
$(O)cursinit.o: $(WCURSES)\cursinit.c $(WCURSES)\cursinit.h $(INCL)\wincurs.h $(INCL)\date.h $(O)cursinit.o: $(WCURSES)\cursinit.c $(WCURSES)\cursinit.h $(INCL)\wincurs.h
$(O)cursinvt.o: $(WCURSES)\cursinvt.c $(WCURSES)\cursinvt.h $(INCL)\wincurs.h $(O)cursinvt.o: $(WCURSES)\cursinvt.c $(WCURSES)\cursinvt.h $(INCL)\wincurs.h
$(O)cursmain.o: $(WCURSES)\cursmain.c $(INCL)\wincurs.h $(O)cursmain.o: $(WCURSES)\cursmain.c $(INCL)\wincurs.h
$(O)cursmesg.o: $(WCURSES)\cursmesg.c $(WCURSES)\cursmesg.h $(INCL)\wincurs.h $(O)cursmesg.o: $(WCURSES)\cursmesg.c $(WCURSES)\cursmesg.h $(INCL)\wincurs.h

159
win/curses/cursinit.c
View File

@@ -7,8 +7,7 @@
#include "hack.h" #include "hack.h"
#include "wincurs.h" #include "wincurs.h"
#include "cursinit.h" #include "cursinit.h"
#include "patchlevel.h" /*#include "patchlevel.h"*/
#include "date.h"
#include <ctype.h> #include <ctype.h>
@@ -60,11 +59,13 @@ nhrgb orig_hiwhite;
"|_| \\_| \\___| \\__||_| |_| \\__,_| \\___||_|\\_\\" "|_| \\_| \\___| \\__||_| |_| \\__,_| \\___||_|\\_\\"
/* win* is size and placement of window to change, x/y/w/h is baseline which can /* win* is size and placement of window to change, x/y/w/h is baseline
decrease depending on alignment of win* in orientation. which can decrease depending on alignment of win* in orientation.
Negative minh/minw: as much as possible, but at least as much as specified. */ Negative minh/minw: as much as possible, but at least as much as
specified. */
static void static void
set_window_position(int *winx, int *winy, int *winw, int *winh, int orientation, set_window_position(int *winx, int *winy, int *winw, int *winh,
int orientation,
int *x, int *y, int *w, int *h, int border_space, int *x, int *y, int *w, int *h, int border_space,
int minh, int minw) int minh, int minw)
{ {
@@ -107,7 +108,6 @@ set_window_position(int *winx, int *winy, int *winw, int *winh, int orientation,
} }
/* Create the "main" nonvolitile windows used by nethack */ /* Create the "main" nonvolitile windows used by nethack */
void void
curses_create_main_windows() curses_create_main_windows()
{ {
@@ -178,10 +178,11 @@ curses_create_main_windows()
} }
} }
/* Figure out window positions and placements. Status and message area can be aligned /* Figure out window positions and placements. Status and message area
based on configuration. The priority alignment-wise is: status > msgarea > game. can be aligned based on configuration. The priority alignment-wise
Define everything as taking as much space as possible and shrink/move based on is: status > msgarea > game.
alignment positions. */ Define everything as taking as much space as possible and shrink/move
based on alignment positions. */
{ {
int message_x = 0; int message_x = 0;
int message_y = 0; int message_y = 0;
@@ -204,6 +205,7 @@ curses_create_main_windows()
boolean status_vertical = FALSE; boolean status_vertical = FALSE;
boolean msg_vertical = FALSE; boolean msg_vertical = FALSE;
if (status_orientation == ALIGN_LEFT || if (status_orientation == ALIGN_LEFT ||
status_orientation == ALIGN_RIGHT) status_orientation == ALIGN_RIGHT)
status_vertical = TRUE; status_vertical = TRUE;
@@ -217,8 +219,10 @@ curses_create_main_windows()
/* Vertical windows have priority. Otherwise, priotity is: /* Vertical windows have priority. Otherwise, priotity is:
status > inv > msg */ status > inv > msg */
if (status_vertical) if (status_vertical)
set_window_position(&status_x, &status_y, &status_width, &status_height, set_window_position(&status_x, &status_y,
status_orientation, &map_x, &map_y, &map_width, &map_height, &status_width, &status_height,
status_orientation,
&map_x, &map_y, &map_width, &map_height,
border_space, statusheight, 26); border_space, statusheight, 26);
if (iflags.perm_invent) { if (iflags.perm_invent) {
@@ -228,24 +232,31 @@ curses_create_main_windows()
width = 25; width = 25;
set_window_position(&inv_x, &inv_y, &inv_width, &inv_height, set_window_position(&inv_x, &inv_y, &inv_width, &inv_height,
ALIGN_RIGHT, &map_x, &map_y, &map_width, &map_height, ALIGN_RIGHT, &map_x, &map_y,
&map_width, &map_height,
border_space, -1, width); border_space, -1, width);
} }
if (msg_vertical) if (msg_vertical)
set_window_position(&message_x, &message_y, &message_width, &message_height, set_window_position(&message_x, &message_y,
message_orientation, &map_x, &map_y, &map_width, &map_height, &message_width, &message_height,
message_orientation,
&map_x, &map_y, &map_width, &map_height,
border_space, -1, -25); border_space, -1, -25);
/* Now draw horizontal windows */ /* Now draw horizontal windows */
if (!status_vertical) if (!status_vertical)
set_window_position(&status_x, &status_y, &status_width, &status_height, set_window_position(&status_x, &status_y,
status_orientation, &map_x, &map_y, &map_width, &map_height, &status_width, &status_height,
status_orientation,
&map_x, &map_y, &map_width, &map_height,
border_space, statusheight, 26); border_space, statusheight, 26);
if (!msg_vertical) if (!msg_vertical)
set_window_position(&message_x, &message_y, &message_width, &message_height, set_window_position(&message_x, &message_y,
message_orientation, &map_x, &map_y, &map_width, &map_height, &message_width, &message_height,
message_orientation,
&map_x, &map_y, &map_width, &map_height,
border_space, -1, -25); border_space, -1, -25);
if (map_width > COLNO) if (map_width > COLNO)
@@ -273,7 +284,8 @@ curses_create_main_windows()
curses_add_nhwin(INV_WIN, inv_height, inv_width, inv_y, inv_x, curses_add_nhwin(INV_WIN, inv_height, inv_width, inv_y, inv_x,
ALIGN_RIGHT, borders); ALIGN_RIGHT, borders);
curses_add_nhwin(MAP_WIN, map_height, map_width, map_y, map_x, 0, borders); curses_add_nhwin(MAP_WIN, map_height, map_width,
map_y, map_x, 0, borders);
refresh(); refresh();
@@ -290,9 +302,7 @@ curses_create_main_windows()
} }
} }
/* Initialize curses colors to colors used by NetHack */ /* Initialize curses colors to colors used by NetHack */
void void
curses_init_nhcolors() curses_init_nhcolors()
{ {
@@ -312,7 +322,7 @@ curses_init_nhcolors()
int i; int i;
boolean hicolor = FALSE; boolean hicolor = FALSE;
int clr_remap[16] = { static const int clr_remap[16] = {
COLOR_BLACK, COLOR_RED, COLOR_GREEN, COLOR_YELLOW, COLOR_BLACK, COLOR_RED, COLOR_GREEN, COLOR_YELLOW,
COLOR_BLUE, COLOR_BLUE,
COLOR_MAGENTA, COLOR_CYAN, -1, COLOR_WHITE, COLOR_MAGENTA, COLOR_CYAN, -1, COLOR_WHITE,
@@ -329,7 +339,8 @@ curses_init_nhcolors()
if (COLORS >= 16) if (COLORS >= 16)
hicolor = TRUE; hicolor = TRUE;
/* Work around the crazy definitions above for more background colors... */ /* Work around the crazy definitions above for more background
colors... */
for (i = 0; i < (COLORS >= 16 ? 16 : 8); i++) { for (i = 0; i < (COLORS >= 16 ? 16 : 8); i++) {
init_pair((hicolor ? 49 : 9) + i, clr_remap[i], COLOR_GREEN); init_pair((hicolor ? 49 : 9) + i, clr_remap[i], COLOR_GREEN);
init_pair((hicolor ? 65 : 33) + i, clr_remap[i], COLOR_YELLOW); init_pair((hicolor ? 65 : 33) + i, clr_remap[i], COLOR_YELLOW);
@@ -403,10 +414,8 @@ curses_init_nhcolors()
#endif #endif
} }
/* Allow player to pick character's role, race, gender, and alignment. /* Allow player to pick character's role, race, gender, and alignment.
Borrowed from the Gnome window port. */ Borrowed from the Gnome window port. */
void void
curses_choose_character() curses_choose_character()
{ {
@@ -427,7 +436,6 @@ curses_choose_character()
/* This part is irritating: we have to strip the choices off of /* This part is irritating: we have to strip the choices off of
the string and put them in a separate string in order to use the string and put them in a separate string in order to use
curses_character_input_dialog for this prompt. */ curses_character_input_dialog for this prompt. */
while (cur_character != '[') { while (cur_character != '[') {
cur_character = prompt[count]; cur_character = prompt[count];
count++; count++;
@@ -455,7 +463,6 @@ curses_choose_character()
} }
/* Add capital letters as choices that aren't displayed */ /* Add capital letters as choices that aren't displayed */
for (count = 0; tmpchoice[count]; count++) { for (count = 0; tmpchoice[count]; count++) {
tmpchoice[count] = toupper(tmpchoice[count]); tmpchoice[count] = toupper(tmpchoice[count]);
} }
@@ -493,7 +500,8 @@ curses_choose_character()
pickmap = (int *) alloc(sizeof (int) * (n + 1)); pickmap = (int *) alloc(sizeof (int) * (n + 1));
for (;;) { for (;;) {
for (n = 0, i = 0; roles[i].name.m; i++) { for (n = 0, i = 0; roles[i].name.m; i++) {
if (ok_role(i, flags.initrace, flags.initgend, flags.initalign)) { if (ok_role(i, flags.initrace,
flags.initgend, flags.initalign)) {
if (flags.initgend >= 0 && flags.female && roles[i].name.f) if (flags.initgend >= 0 && flags.female && roles[i].name.f)
choices[n] = roles[i].name.f; choices[n] = roles[i].name.f;
else else
@@ -514,8 +522,7 @@ curses_choose_character()
} }
choices[n] = (const char *) 0; choices[n] = (const char *) 0;
if (n > 1) if (n > 1)
sel = sel = curses_character_dialog(choices,
curses_character_dialog(choices,
"Choose one of the following roles:"); "Choose one of the following roles:");
else else
sel = 0; sel = 0;
@@ -554,7 +561,8 @@ curses_choose_character()
/* Count the number of valid races */ /* Count the number of valid races */
n = 0; /* number valid */ n = 0; /* number valid */
for (i = 0; races[i].noun; i++) { for (i = 0; races[i].noun; i++) {
if (ok_race(flags.initrole, i, flags.initgend, flags.initalign)) if (ok_race(flags.initrole, i,
flags.initgend, flags.initalign))
n++; n++;
} }
if (n == 0) { if (n == 0) {
@@ -567,7 +575,8 @@ curses_choose_character()
choices = (const char **) alloc(sizeof (char *) * (n + 1)); choices = (const char **) alloc(sizeof (char *) * (n + 1));
pickmap = (int *) alloc(sizeof (int) * (n + 1)); pickmap = (int *) alloc(sizeof (int) * (n + 1));
for (n = 0, i = 0; races[i].noun; i++) { for (n = 0, i = 0; races[i].noun; i++) {
if (ok_race(flags.initrole, i, flags.initgend, flags.initalign)) { if (ok_race(flags.initrole, i,
flags.initgend, flags.initalign)) {
choices[n] = races[i].noun; choices[n] = races[i].noun;
pickmap[n++] = i; pickmap[n++] = i;
} }
@@ -575,9 +584,8 @@ curses_choose_character()
choices[n] = (const char *) 0; choices[n] = (const char *) 0;
/* Permit the user to pick, if there is more than one */ /* Permit the user to pick, if there is more than one */
if (n > 1) if (n > 1)
sel = sel = curses_character_dialog(choices,
curses_character_dialog(choices, "Choose one of the following races:");
"Choose one of the following races:");
else else
sel = 0; sel = 0;
if (sel >= 0) if (sel >= 0)
@@ -613,7 +621,8 @@ curses_choose_character()
/* Count the number of valid genders */ /* Count the number of valid genders */
n = 0; /* number valid */ n = 0; /* number valid */
for (i = 0; i < ROLE_GENDERS; i++) { for (i = 0; i < ROLE_GENDERS; i++) {
if (ok_gend(flags.initrole, flags.initrace, i, flags.initalign)) if (ok_gend(flags.initrole, flags.initrace,
i, flags.initalign))
n++; n++;
} }
if (n == 0) { if (n == 0) {
@@ -626,7 +635,8 @@ curses_choose_character()
choices = (const char **) alloc(sizeof (char *) * (n + 1)); choices = (const char **) alloc(sizeof (char *) * (n + 1));
pickmap = (int *) alloc(sizeof (int) * (n + 1)); pickmap = (int *) alloc(sizeof (int) * (n + 1));
for (n = 0, i = 0; i < ROLE_GENDERS; i++) { for (n = 0, i = 0; i < ROLE_GENDERS; i++) {
if (ok_gend(flags.initrole, flags.initrace, i, flags.initalign)) { if (ok_gend(flags.initrole, flags.initrace,
i, flags.initalign)) {
choices[n] = genders[i].adj; choices[n] = genders[i].adj;
pickmap[n++] = i; pickmap[n++] = i;
} }
@@ -634,9 +644,8 @@ curses_choose_character()
choices[n] = (const char *) 0; choices[n] = (const char *) 0;
/* Permit the user to pick, if there is more than one */ /* Permit the user to pick, if there is more than one */
if (n > 1) if (n > 1)
sel = sel = curses_character_dialog(choices,
curses_character_dialog(choices, "Choose one of the following genders:");
"Choose one of the following genders:");
else else
sel = 0; sel = 0;
if (sel >= 0) if (sel >= 0)
@@ -671,7 +680,8 @@ curses_choose_character()
/* Count the number of valid alignments */ /* Count the number of valid alignments */
n = 0; /* number valid */ n = 0; /* number valid */
for (i = 0; i < ROLE_ALIGNS; i++) { for (i = 0; i < ROLE_ALIGNS; i++) {
if (ok_align(flags.initrole, flags.initrace, flags.initgend, i)) if (ok_align(flags.initrole, flags.initrace,
flags.initgend, i))
n++; n++;
} }
if (n == 0) { if (n == 0) {
@@ -683,7 +693,8 @@ curses_choose_character()
choices = (const char **) alloc(sizeof (char *) * (n + 1)); choices = (const char **) alloc(sizeof (char *) * (n + 1));
pickmap = (int *) alloc(sizeof (int) * (n + 1)); pickmap = (int *) alloc(sizeof (int) * (n + 1));
for (n = 0, i = 0; i < ROLE_ALIGNS; i++) { for (n = 0, i = 0; i < ROLE_ALIGNS; i++) {
if (ok_align(flags.initrole, flags.initrace, flags.initgend, i)) { if (ok_align(flags.initrole, flags.initrace,
flags.initgend, i)) {
choices[n] = aligns[i].adj; choices[n] = aligns[i].adj;
pickmap[n++] = i; pickmap[n++] = i;
} }
@@ -691,9 +702,8 @@ curses_choose_character()
choices[n] = (const char *) 0; choices[n] = (const char *) 0;
/* Permit the user to pick, if there is more than one */ /* Permit the user to pick, if there is more than one */
if (n > 1) if (n > 1)
sel = sel = curses_character_dialog(choices,
curses_character_dialog(choices, "Choose one of the following alignments:");
"Choose one of the following alignments:");
else else
sel = 0; sel = 0;
if (sel >= 0) if (sel >= 0)
@@ -716,9 +726,7 @@ curses_choose_character()
} }
} }
/* Prompt user for character race, role, alignment, or gender */ /* Prompt user for character race, role, alignment, or gender */
int int
curses_character_dialog(const char **choices, const char *prompt) curses_character_dialog(const char **choices, const char *prompt)
{ {
@@ -771,14 +779,12 @@ curses_character_dialog(const char **choices, const char *prompt)
return ret; return ret;
} }
/* Initialize and display options appropriately */ /* Initialize and display options appropriately */
void void
curses_init_options() curses_init_options()
{ {
set_wc_option_mod_status(WC_ALIGN_MESSAGE | WC_ALIGN_STATUS | WC_COLOR | set_wc_option_mod_status(WC_ALIGN_MESSAGE | WC_ALIGN_STATUS | WC_COLOR
WC_HILITE_PET | WC_POPUP_DIALOG, SET_IN_GAME); | WC_HILITE_PET | WC_POPUP_DIALOG, SET_IN_GAME);
set_wc2_option_mod_status(WC2_GUICOLOR, SET_IN_GAME); set_wc2_option_mod_status(WC2_GUICOLOR, SET_IN_GAME);
@@ -792,9 +798,10 @@ curses_init_options()
/* Make sure that DECgraphics is not set to true via the config /* Make sure that DECgraphics is not set to true via the config
file, as this will cause display issues. We can't disable it in file, as this will cause display issues. We can't disable it in
options.c in case the game is compiled with both tty and curses. */ options.c in case the game is compiled with both tty and curses. */
if (!symset[PRIMARY].name || !strcmpi(symset[PRIMARY].name, "DECgraphics")) { if (!symset[PRIMARY].name
load_symset("curses",PRIMARY); || !strcmpi(symset[PRIMARY].name, "DECgraphics")) {
load_symset("default",ROGUESET); load_symset("curses", PRIMARY);
load_symset("default", ROGUESET);
} }
#ifdef PDCURSES #ifdef PDCURSES
/* PDCurses for SDL, win32 and OS/2 has the ability to set the /* PDCurses for SDL, win32 and OS/2 has the ability to set the
@@ -830,7 +837,7 @@ curses_init_options()
if (!iflags.wc2_petattr) { if (!iflags.wc2_petattr) {
iflags.wc2_petattr = A_REVERSE; iflags.wc2_petattr = A_REVERSE;
} else { /* Pet attribute specified, so hilite_pet should be true */ } else { /* Pet attribute specified, so hilite_pet should be true */
iflags.hilite_pet = TRUE; iflags.hilite_pet = TRUE;
} }
@@ -842,14 +849,11 @@ curses_init_options()
#endif #endif
} }
/* Display an ASCII splash screen if the splash_screen option is set */ /* Display an ASCII splash screen if the splash_screen option is set */
void void
curses_display_splash_window() curses_display_splash_window()
{ {
int x_start; int i, x_start, y_start;
int y_start;
curses_get_window_xy(MAP_WIN, &x_start, &y_start); curses_get_window_xy(MAP_WIN, &x_start, &y_start);
@@ -857,8 +861,9 @@ curses_display_splash_window()
iflags.wc_splash_screen = FALSE; /* No room for s.s. */ iflags.wc_splash_screen = FALSE; /* No room for s.s. */
} }
curses_toggle_color_attr(stdscr, CLR_WHITE, A_NORMAL, ON);
if (iflags.wc_splash_screen) { if (iflags.wc_splash_screen) {
if (iflags.wc2_guicolor)
curses_toggle_color_attr(stdscr, CLR_WHITE, A_NORMAL, ON);
mvaddstr(y_start, x_start, NETHACK_SPLASH_A); mvaddstr(y_start, x_start, NETHACK_SPLASH_A);
mvaddstr(y_start + 1, x_start, NETHACK_SPLASH_B); mvaddstr(y_start + 1, x_start, NETHACK_SPLASH_B);
mvaddstr(y_start + 2, x_start, NETHACK_SPLASH_C); mvaddstr(y_start + 2, x_start, NETHACK_SPLASH_C);
@@ -867,34 +872,18 @@ curses_display_splash_window()
mvaddstr(y_start + 5, x_start, NETHACK_SPLASH_F); mvaddstr(y_start + 5, x_start, NETHACK_SPLASH_F);
y_start += 7; y_start += 7;
} }
if (iflags.wc2_guicolor)
curses_toggle_color_attr(stdscr, CLR_WHITE, A_NORMAL, OFF);
curses_toggle_color_attr(stdscr, CLR_WHITE, A_NORMAL, OFF); for (i = 1; i <= 4; ++i) {
mvaddstr(y_start, x_start, copyright_banner_line(i));
y_start++;
}
#ifdef COPYRIGHT_BANNER_A
mvaddstr(y_start, x_start, COPYRIGHT_BANNER_A);
y_start++;
#endif
#ifdef COPYRIGHT_BANNER_B
mvaddstr(y_start, x_start, COPYRIGHT_BANNER_B);
y_start++;
#endif
#ifdef COPYRIGHT_BANNER_C
mvaddstr(y_start, x_start, COPYRIGHT_BANNER_C);
y_start++;
#endif
#ifdef COPYRIGHT_BANNER_D /* Just in case */
mvaddstr(y_start, x_start, COPYRIGHT_BANNER_D);
y_start++;
#endif
refresh(); refresh();
} }
/* Resore colors and cursor state before exiting */ /* Resore colors and cursor state before exiting */
void void
curses_cleanup() curses_cleanup()
{ {

4
win/curses/cursinvt.c
View File

@@ -16,9 +16,7 @@ curses_update_inv(void)
{ {
WINDOW *win = curses_get_nhwin(INV_WIN); WINDOW *win = curses_get_nhwin(INV_WIN);
boolean border; boolean border;
int x = 0; int x = 0, y = 0;
int y = 0;
attr_t attr = A_UNDERLINE;
/* Check if the inventory window is enabled in first place */ /* Check if the inventory window is enabled in first place */
if (!win) { if (!win) {