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-07-03 18:25:55 -04:00
parent ca6dbd4b71 4a74968a58
commit 21de4c06ef
2 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/objnam.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 objnam.c $NHDT-Date: 1561081353 2019/06/21 01:42:33 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.244 $ */
/* NetHack 3.6 objnam.c $NHDT-Date: 1562186589 2019/07/03 20:43:09 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.245 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2011. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1832,6 +1832,30 @@ struct obj *obj;
return s;
}
#if 0 /* stalled-out work in progress */
/* Doname2() for itemized buying of 'obj' from a shop */
char *
payDoname(obj)
struct obj *obj;
{
static const char and_contents[] = " and its contents";
char *p = doname(obj);
if (Is_container(obj) && !obj->cknown) {
if (obj->unpaid) {
if ((int) strlen(p) + sizeof and_contents - 1 < BUFSZ - PREFIX)
Strcat(p, and_contents);
*p = highc(*p);
} else {
p = strprepend(p, "Contents of ");
}
} else {
*p = highc(*p);
}
return p;
}
#endif /*0*/
/* returns "[your ]xname(obj)" or "Foobar's xname(obj)" or "the xname(obj)" */
char *
yname(obj)

29
util/makedefs.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 makedefs.c $NHDT-Date: 1557254354 2019/05/07 18:39:14 $ $NHDT-Branch: NetHack-3.6.2 $:$NHDT-Revision: 1.145 $ */
/* NetHack 3.6 makedefs.c $NHDT-Date: 1562180226 2019/07/03 18:57:06 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.149 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015. */
/* Copyright (c) M. Stephenson, 1990, 1991. */
@@ -1513,9 +1513,11 @@ static const char *build_opts[] = {
#ifdef TEXTCOLOR
"color",
#endif
#ifdef TTY_GRAPHICS
#ifdef TTY_TILES_ESCCODES
"console escape codes for tile hinting",
#endif
#endif
#ifdef COM_COMPL
"command line completion",
#endif
@@ -1640,20 +1642,25 @@ static const char *build_opts[] = {
#ifdef SUSPEND
"suspend command",
#endif
#ifdef TTY_GRAPHICS
#ifdef TERMINFO
"terminal info library",
#else
#if defined(TERMLIB) \
|| ((!defined(MICRO) && !defined(WIN32)) && defined(TTY_GRAPHICS))
#if defined(TERMLIB) || (!defined(MICRO) && !defined(WIN32))
"terminal capability library",
#endif
#endif
#endif /*TTY_GRAPHICS*/
/*#ifdef X11_GRAPHICS*/
#ifdef USE_XPM
"tile_file in XPM format",
"tiles file in XPM format",
#endif
/*#endif*/
/*#if (defined(QT_GRAPHICS) || defined(X11_GRAPHICS)*/
#ifdef GRAPHIC_TOMBSTONE
"graphical RIP screen",
#endif
/*#endif*/
#ifdef TIMED_DELAY
"timed wait for display effects",
#endif
@@ -1706,25 +1713,25 @@ static struct win_info window_opts[] = {
#ifdef X11_GRAPHICS
{ "X11", "X11" },
#endif
#ifdef QT_GRAPHICS
#ifdef QT_GRAPHICS /* too vague; there are multiple incompatible versions */
{ "Qt", "Qt" },
#endif
#ifdef GNOME_GRAPHICS
#ifdef GNOME_GRAPHICS /* unmaintained/defunct */
{ "Gnome", "Gnome" },
#endif
#ifdef MAC
#ifdef MAC /* defunct OS 9 interface */
{ "mac", "Mac" },
#endif
#ifdef AMIGA_INTUITION
#ifdef AMIGA_INTUITION /* unmaintained/defunct */
{ "amii", "Amiga Intuition" },
#endif
#ifdef GEM_GRAPHICS
#ifdef GEM_GRAPHICS /* defunct Atari interface */
{ "Gem", "Gem" },
#endif
#ifdef MSWIN_GRAPHICS
#ifdef MSWIN_GRAPHICS /* win32 */
{ "mswin", "mswin" },
#endif
#ifdef BEOS_GRAPHICS
#ifdef BEOS_GRAPHICS /* unmaintained/defunct */
{ "BeOS", "BeOS InterfaceKit" },
#endif
{ 0, 0 }