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

Merge branch 'master' into win32-x64-working

Browse Source 
Conflicts:
	src/options.c
This commit is contained in:
nhmall
2015-06-11 22:24:42 -04:00
parent b2a1d142ab af54125c22
commit 017e826837
9 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dat/opthelp
View File

@@ -103,10 +103,12 @@ disclose the types of information you want offered at the end of the
fruit the name of a fruit you enjoy eating [slime mold]
(basically a whimsy which NetHack uses from time to time).
menustyle user interface for selection of multiple objects:
Traditional -- one object at a time prompting;
Combination -- prompt for classes of interest, then menu;
Partial -- skip class prompt, use menu of all objects;
Full -- menu for classes of interest, then object menu;
Traditional -- prompt for classes of interest, then
prompt item-by-item for those classes;
Combination -- prompt for classes of interest, then
use a menu for choosing items;
Full -- menu for classes of interest, then item menu;
Partial -- skip class filtering, use menu of all items;
only the first letter ('T','C','P','F') matters; 'N' (None)
is a synonym for 'T', as is boolean style negation [Full]
number_pad alphabetic versus numeric control over movement:
@@ -202,16 +204,16 @@ menu_* create single character accelerators for menu commands. Below
ports that implement them: 'x' is X11, 't' is tty, 'g' is Gem,
'a' is Amiga.
menu_deselect_all deselect all items in a menu [-](gxta)
menu_deselect_page deselect all items on this page of a menu [\](gta)
menu_deselect_page deselect all items on this menu page [\](gta)
menu_first_page jump to the first page in a menu [^](gta)
menu_invert_all invert all items in a menu [@](gxta)
menu_invert_page invert all items on this page of a menu [~](gta)
menu_invert_page invert all items on this menu page [~](gta)
menu_last_page jump to the last page in a menu [|](gta)
menu_next_page goto the next menu page [>](gta)
menu_previous_page goto the previous menu page [<](gta)
menu_search search for a menu item [:](gxa)
menu_search search for a menu item [:](gxta)
menu_select_all select all items in a menu [.](gxta)
menu_select_page select all items on this page of a menu [,](gta)
menu_select_page select all items on this menu page [,](gta)
monsters like dungeon, but for monster symbols
default: abcdefghijklmnopqrstuvwxyz
ABCDEFGHIJKLMNOPQRSTUVWXYZ@\ \\&;:~]

16
doc/Guidebook.mn
View File

@@ -1,4 +1,4 @@
.\" $NHDT-Branch: master $:$NHDT-Revision: 1.174 $ $NHDT-Date: 1433842150 2015/06/09 09:29:10 $
.\" $NHDT-Branch: master $:$NHDT-Revision: 1.175 $ $NHDT-Date: 1434054937 2015/06/11 20:35:37 $
.ds h0 "NetHack Guidebook
.ds h1
.ds h2 %
@@ -2082,15 +2082,19 @@ See ``Configuring Menu Colors'' on how to configure the colors.
Controls the interface used when you need to choose various objects (in
response to the Drop command, for instance). The value specified should
be the first letter of one of the following: traditional, combination,
partial, or full. Traditional was the only interface available for
earlier versions; it consists of a prompt for object class characters,
full, or partial.
Traditional was the only interface available for
early versions; it consists of a prompt for object class characters,
followed by an object-by-object prompt for all items matching the selected
object class(es). Combination starts with a prompt for object class(es)
object class(es).
Combination starts with a prompt for object class(es)
of interest, but then displays a menu of matching objects rather than
prompting one-by-one. Partial skips the object class filtering and
immediately displays a menu of all objects. Full displays a menu of
prompting one-by-one.
Full displays a menu of
object classes rather than a character prompt, and then a menu of matching
objects for selection.
Partial skips the object class filtering and
immediately displays a menu of all objects.
.lp menu_deselect_all
Menu character accelerator to deselect all items in a menu.
Implemented by the Amiga, Gem, X11 and tty ports.

14
doc/Guidebook.tex
View File

@@ -2519,15 +2519,19 @@ See ``{\it Configuring Menu Colors\/}'' on how to configure the colors.
Controls the interface used when you need to choose various objects (in
response to the Drop command, for instance). The value specified should
be the first letter of one of the following: traditional, combination,
partial, or full. Traditional was the only interface available for
earlier versions; it consists of a prompt for object class characters,
full, or partial.
Traditional was the only interface available for
early versions; it consists of a prompt for object class characters,
followed by an object-by-object prompt for all items matching the selected
object class(es). Combination starts with a prompt for object class(es)
object class(es).
Combination starts with a prompt for object class(es)
of interest, but then displays a menu of matching objects rather than
prompting one-by-one. Partial skips the object class filtering and
immediately displays a menu of all objects. Full displays a menu of
prompting one-by-one.
Full displays a menu of
object classes rather than a character prompt, and then a menu of matching
objects for selection.
Partial skips the object class filtering and
immediately displays a menu of all objects.
\item[\ib{menu\_deselect\_all}]
Menu character accelerator to deselect all items in a menu.
Implemented by the Amiga, Gem, X11 and tty ports.

6
include/hack.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 hack.h $NHDT-Date: 1432512781 2015/05/25 00:13:01 $ $NHDT-Branch: master $:$NHDT-Revision: 1.64 $ */
/* NetHack 3.6 hack.h $NHDT-Date: 1434056948 2015/06/11 21:09:08 $ $NHDT-Branch: master $:$NHDT-Revision: 1.66 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -355,8 +355,8 @@ NEARDATA extern coord bhitpos; /* place where throw or zap hits or stops */
#define MENUTYPELEN sizeof("traditional ")
#define MENU_TRADITIONAL 0
#define MENU_COMBINATION 1
#define MENU_PARTIAL 2
#define MENU_FULL 3
#define MENU_FULL 2
#define MENU_PARTIAL 3
#define MENU_SELECTED TRUE
#define MENU_UNSELECTED FALSE

8
src/cmd.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 cmd.c $NHDT-Date: 1433291955 2015/06/03 00:39:15 $ $NHDT-Branch: master $:$NHDT-Revision: 1.194 $ */
/* NetHack 3.6 cmd.c $NHDT-Date: 1434071945 2015/06/12 01:19:05 $ $NHDT-Branch: master $:$NHDT-Revision: 1.195 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1570,7 +1570,7 @@ int mode, final, attrindx;
alimit = ATTRMAX(attrindx);
/* criterium for whether the limit is interesting varies */
interesting_alimit =
final ? (abase != alimit)
final ? TRUE /* was originally `(abase != alimit)' */
: (alimit != (attrindx != A_STR ? 18 : STR18(100)));
paren_pfx = final ? " (" : " (current; ";
if (acurrent != abase) {
@@ -1584,7 +1584,9 @@ int mode, final, attrindx;
paren_pfx = ", ";
}
if (interesting_alimit) {
Sprintf(eos(valubuf), "%slimit:%s", paren_pfx,
Sprintf(eos(valubuf), "%s%slimit:%s", paren_pfx,
/* more verbose if exceeding 'limit' due to magic bonus */
(acurrent > alimit) ? "innate " : "",
attrval(attrindx, alimit, valstring));
/* paren_pfx = ", "; */
}

12
src/end.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 end.c $NHDT-Date: 1432512762 2015/05/25 00:12:42 $ $NHDT-Branch: master $:$NHDT-Revision: 1.98 $ */
/* NetHack 3.6 end.c $NHDT-Date: 1434071495 2015/06/12 01:11:35 $ $NHDT-Branch: master $:$NHDT-Revision: 1.99 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -539,21 +539,21 @@ VA_DECL(const char *, str)
#else
if (!wizard) {
if (sysopt.support)
raw_printf("To report this error, %s%s.", sysopt.support,
raw_printf("To report this error, %s%s", sysopt.support,
!program_state.something_worth_saving
? ""
? "."
: " and it may be possible to rebuild.");
else if (sysopt.wizards) {
char *tmp = build_english_list(sysopt.wizards);
raw_printf("To report this error, contact %s%s", tmp,
!program_state.something_worth_saving
? ""
? "."
: " and it may be possible to rebuild.");
free(tmp);
} else
raw_printf("Report error to \"%s\"%s.", WIZARD_NAME,
raw_printf("Report error to \"%s\"%s", WIZARD_NAME,
!program_state.something_worth_saving
? ""
? "."
: " and it may be possible to rebuild.");
}
#endif

4
src/objnam.c
View File

@@ -2360,7 +2360,7 @@ rnd_otyp_by_wpnskill(skill)
schar skill;
{
int i, n = 0;
short otyp;
short otyp = STRANGE_OBJECT;
for (i = bases[WEAPON_CLASS];
i < NUM_OBJECTS && objects[i].oc_class == WEAPON_CLASS; i++)
if (objects[i].oc_skill == skill) {
@@ -2375,7 +2375,7 @@ schar skill;
if (--n < 0)
return i;
}
return STRANGE_OBJECT;
return otyp;
}
/*

8
src/options.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 options.c $NHDT-Date: 1434024839 2015/06/11 12:13:59 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.218 $ */
/* NetHack 3.6 options.c $NHDT-Date: 1434056951 2015/06/11 21:09:11 $ $NHDT-Branch: master $:$NHDT-Revision: 1.219 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -3072,7 +3072,7 @@ boolean tinitial, tfrom_file;
return;
}
/* menustyle:traditional or combo or full or partial */
/* menustyle:traditional or combination or full or partial */
if (match_optname(opts, "menustyle", 4, TRUE)) {
int tmp;
boolean val_required = (strlen(opts) > 5 && !negated);
@@ -3366,7 +3366,7 @@ boolean tinitial, tfrom_file;
}
static NEARDATA const char *menutype[] = { "traditional", "combination",
"partial", "full" };
"full", "partial" };
static NEARDATA const char *burdentype[] = { "unencumbered", "burdened",
"stressed", "strained",
@@ -4810,7 +4810,6 @@ const char *mapping;
{
struct autopickup_exception *ape, **apehead;
char text[256], *text2;
int textsize = 0;
boolean grab = FALSE;
if (sscanf(mapping, "\"%255[^\"]\"", text) == 1) {
@@ -4822,7 +4821,6 @@ const char *mapping;
grab = FALSE;
++text2;
}
textsize = strlen(text2);
apehead = (grab) ? &iflags.autopickup_exceptions[AP_GRAB]
: &iflags.autopickup_exceptions[AP_LEAVE];
ape = (struct autopickup_exception *) alloc(

4
src/version.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 version.c $NHDT-Date: 1432339708 2015/05/23 00:08:28 $ $NHDT-Branch: master $:$NHDT-Revision: 1.30 $ */
/* NetHack 3.6 version.c $NHDT-Date: 1434025553 2015/06/11 12:25:53 $ $NHDT-Branch: master $:$NHDT-Revision: 1.31 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -15,7 +15,7 @@
#include "patchlevel.h"
#endif
#define BETA_INFO "Beta1"
#define BETA_INFO "Beta2"
/* fill buffer with short version (so caller can avoid including date.h) */
char *