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

pull in the recent unconditionals merge from master

Browse Source
This commit is contained in:
Derek S. Ray
2015-02-27 21:25:00 -05:00
parent 7f0ff8f011
commit b1a7bbbbdb
538 changed files with 1715 additions and 5685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
win/X11/Install.X11
View File

@@ -1,3 +1,5 @@
$NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
$Date: 2007/12/13 20:17:11 $ $Revision: 1.6 $
This document describes the installation of NetHack with an X11 interface.

3
win/X11/NetHack.ad
View File

@@ -1,3 +1,6 @@
! $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
! $Date: 2003/10/03 02:09:25 $ $Revision: 1.5 $
! The display_file, tombstone, and menu windows are all formatted assuming
! a fixed width font. Text windows may or may not be formatted as above.
! The rip window applies if the GRAPHIC_TOMBSTONE option is turned on, and

3
win/X11/Window.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 Window.c $Date$ $Revision$ */
/* NetHack 3.5 Window.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 Window.c $Date: 2009/05/06 10:55:43 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)Window.c 3.5 1993/02/02 */
/* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */

3
win/X11/dialogs.c
View File

@@ -39,6 +39,9 @@
* + Added workaround for SYSV include problem.
* + Changed the default width response text widget to be as wide as the
* window itself. Suggestion from David E. Wexelblat, dwex@goblin.org.
*
* $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
* $Date: 2002/03/31 17:11:23 $ $Revision: 1.2 $
*/
#ifndef SYSV

2
win/X11/nethack.rc
View File

@@ -1,5 +1,7 @@
#
# Nethack configuration file.
# $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# $Date: 2007/12/13 20:17:11 $ $Revision: 1.2 $
#
# Naming this file $(HOME)/.nethackrc (for UNIX) or setting the environment
# variable NETHACKOPTIONS to point to its full path name elsewhere tells

3
win/X11/nh32icon
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 nh32icon $Date$ $Revision$ */
/* NetHack 3.5 nh32icon $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 nh32icon $Date: 2009/05/06 10:55:43 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)nh32icon 3.5 2002/02/12 */
/* Copyright (C) 1993,1995 by Robert Patrick Rankin */
/* NetHack may be freely redistributed. See license for details. */

3
win/X11/nh56icon
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 nh56icon $Date$ $Revision$ */
/* NetHack 3.5 nh56icon $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 nh56icon $Date: 2009/05/06 10:55:43 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)nh56icon 3.5 2002/02/12 */
/* Copyright (c) 1993,1995 by M. Stephenson */
/* NetHack may be freely redistributed. See license for details. */

3
win/X11/nh72icon
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 nh72icon $Date$ $Revision$ */
/* NetHack 3.5 nh72icon $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 nh72icon $Date: 2009/05/06 10:55:43 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)nh72icon 3.5 1993/01/21 */
/* Copyright (c) 1993 by M. Stephenson */
/* NetHack may be freely redistributed. See license for details. */

3
win/X11/tile2x11.c
View File

@@ -1,6 +1,9 @@
/*
* Convert the given input files into an output file that is expected
* by nethack.
*
* $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
* $Date: 2002/03/17 20:02:47 $ $Revision: 1.2 $
*
* Assumptions:
* + Two dimensional byte arrays are in row order and are not padded

3
win/X11/winX.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 winX.c $Date$ $Revision$ */
/* NetHack 3.5 winX.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 winX.c $Date: 2012/01/24 04:26:26 $ $Revision: 1.27 $ */
/* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */

14
win/X11/winmap.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 winmap.c $Date$ $Revision$ */
/* NetHack 3.5 winmap.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 winmap.c $Date: 2009/05/06 10:55:49 $ $Revision: 1.14 $ */
/* SCCS Id: @(#)winmap.c 3.5 2005/11/12 */
/* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */
@@ -838,10 +839,7 @@ display_map_window(wp)
register int row;
struct map_info_t *map_info = wp->map_information;
if ((
#ifdef REINCARNATION
Is_rogue_level(&u.uz) ? map_info->is_tile :
#endif
if ((Is_rogue_level(&u.uz) ? map_info->is_tile :
(map_info->is_tile != iflags.wc_tiled_map)) &&
map_info->tile_map.image_width) {
/* changed map display mode, re-display the full map */
@@ -849,11 +847,7 @@ display_map_window(wp)
sizeof(map_info->t_start));
(void) memset((genericptr_t) map_info->t_stop, (char) COLNO-1,
sizeof(map_info->t_stop));
map_info->is_tile = iflags.wc_tiled_map
#ifdef REINCARNATION
&& !Is_rogue_level(&u.uz)
#endif
;
map_info->is_tile = iflags.wc_tiled_map && !Is_rogue_level(&u.uz);
XClearWindow(XtDisplay(wp->w), XtWindow(wp->w));
set_map_size(wp, COLNO, ROWNO);
check_cursor_visibility(wp);

3
win/X11/winmenu.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 winmenu.c $Date$ $Revision$ */
/* NetHack 3.5 winmenu.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 winmenu.c $Date: 2009/05/06 10:55:53 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)winmenu.c 3.5 1996/08/15 */
/* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */

3
win/X11/winmesg.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 winmesg.c $Date$ $Revision$ */
/* NetHack 3.5 winmesg.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 winmesg.c $Date: 2009/05/06 10:55:57 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)winmesg.c 3.5 1996/04/05 */
/* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */

3
win/X11/winmisc.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 winmisc.c $Date$ $Revision$ */
/* NetHack 3.5 winmisc.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 winmisc.c $Date: 2009/05/06 10:55:57 $ $Revision: 1.7 $ */
/* SCCS Id: @(#)winmisc.c 3.5 2000/05/21 */
/* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */

20
win/X11/winstat.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 winstat.c $Date$ $Revision$ */
/* NetHack 3.5 winstat.c $NHDT-Date: 1425083083 2015/02/28 00:24:43 $ $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.5 $ */
/* NetHack 3.5 winstat.c $Date: 2009/05/06 10:55:59 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)winstat.c 3.5 1996/04/05 */
/* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */
@@ -426,7 +427,6 @@ update_val(attr_rec, new_value)
/* special case: exp can be enabled & disabled */
else if (attr_rec == &shown_stats[F_EXP]) {
static boolean flagexp = TRUE;
#ifdef EXP_ON_BOTL
if (flags.showexp && !flagexp) {
set_name(attr_rec->w, shown_stats[F_EXP].name);
@@ -438,14 +438,6 @@ update_val(attr_rec, new_value)
flagexp = flags.showexp;
}
if (!flagexp) return;
#else
if (flagexp) {
set_name(attr_rec->w, "");
set_value(attr_rec->w, "");
flagexp = FALSE;
}
return; /* don't show it at all */
#endif
}
/* special case: score can be enabled & disabled */
@@ -599,11 +591,7 @@ update_fancy_status(wp)
case F_NAME: val = (long) 0L; break; /* special */
case F_DLEVEL: val = (long) 0L; break; /* special */
#ifndef GOLDOBJ
case F_GOLD: val = (long) u.ugold; break;
#else
case F_GOLD: val = money_cnt(invent); break;
#endif
case F_HP: val = (long) (u.mtimedone ?
(u.mh > 0 ? u.mh : 0):
(u.uhp > 0 ? u.uhp : 0)); break;
@@ -615,11 +603,7 @@ update_fancy_status(wp)
case F_LEVEL: val = (long) (u.mtimedone ?
mons[u.umonnum].mlevel :
u.ulevel); break;
#ifdef EXP_ON_BOTL
case F_EXP: val = flags.showexp ? u.uexp : 0L; break;
#else
case F_EXP: val = 0L; break;
#endif
case F_ALIGN: val = (long) u.ualign.type; break;
case F_TIME: val = flags.time ? (long) moves : 0L; break;
#ifdef SCORE_ON_BOTL

7
win/X11/wintext.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 wintext.c $Date$ $Revision$ */
/* NetHack 3.5 wintext.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 wintext.c $Date: 2012/01/24 04:26:27 $ $Revision: 1.7 $ */
/* SCCS Id: @(#)wintext.c 3.5 1996/04/05 */
/* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */
@@ -468,11 +469,7 @@ calculate_rip_text(int how, time_t when)
/* Put $ on stone */
Sprintf(rip_line[GOLD_LINE], "%ld Au",
#ifndef GOLDOBJ
u.ugold);
#else
done_money);
#endif
/* Put together death description */
formatkiller(buf, sizeof buf, how);

3
win/X11/winval.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 winval.c $Date$ $Revision$ */
/* NetHack 3.5 winval.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 winval.c $Date: 2009/05/06 10:56:06 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)winval.c 3.5 1992/3/7 */
/* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */