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

3
win/gnome/gn_xpms.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gn_xpms.h $Date$ $Revision$ */
/* NetHack 3.5 gn_xpms.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gn_xpms.h $Date: 2009/05/06 10:57:19 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)gnxpms.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnaskstr.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnaskstr.c $Date$ $Revision$ */
/* NetHack 3.5 gnaskstr.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnaskstr.c $Date: 2009/05/06 10:57:24 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)gnaskstr.c 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnaskstr.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnaskstr.h $Date$ $Revision$ */
/* NetHack 3.5 gnaskstr.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnaskstr.h $Date: 2009/05/06 10:57:24 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)gnaskstr.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

10
win/gnome/gnbind.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnbind.c $Date$ $Revision$ */
/* NetHack 3.5 gnbind.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnbind.c $Date: 2012/01/24 04:26:31 $ $Revision: 1.25 $ */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */
@@ -1182,12 +1183,7 @@ void gnome_outrip(winid wid, int how, time_t when)
Strcat(ripString, buf);
/* Put $ on stone */
Sprintf(buf, "%ld Au\n",
#ifndef GOLDOBJ
u.ugold);
#else
done_money);
#endif
Sprintf(buf, "%ld Au\n", done_money);
Strcat(ripString, buf);
/* Put together death description */

3
win/gnome/gnbind.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnbind.h $Date$ $Revision$ */
/* NetHack 3.5 gnbind.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnbind.h $Date: 2012/01/24 04:26:31 $ $Revision: 1.6 $ */
/* SCCS Id: @(#)gnbind.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnglyph.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnglyph.c $Date$ $Revision$ */
/* NetHack 3.5 gnglyph.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnglyph.c $Date: 2009/05/06 10:57:29 $ $Revision: 1.6 $ */
/* SCCS Id: @(#)gnglyph.c 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnglyph.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnglyph.h $Date$ $Revision$ */
/* NetHack 3.5 gnglyph.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnglyph.h $Date: 2009/05/06 10:57:30 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)gnglyph.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

5
win/gnome/gnmain.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnmain.c $Date$ $Revision$ */
/* NetHack 3.5 gnmain.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnmain.c $Date: 2009/05/06 10:57:32 $ $Revision: 1.9 $ */
/* SCCS Id: @(#)gnmain.c 3.5 2008/01/30 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */
@@ -365,14 +366,12 @@ GnomeUIInfo action_menu[] = {
ghack_accelerator_selected,
GINT_TO_POINTER(M('j')), NULL, GNOME_APP_PIXMAP_NONE, NULL, 'j',GDK_MOD1_MASK
},
#ifdef STEED
{
GNOME_APP_UI_ITEM, N_("Ride"),
N_("Ride (or stop riding) a monster"),
doride,
GINT_TO_POINTER(M('r')), NULL, GNOME_APP_PIXMAP_NONE, NULL, 'R',GDK_MOD1_MASK
},
#endif
{
GNOME_APP_UI_ITEM, N_("Wipe face"),
N_("wipe off your face"),

3
win/gnome/gnmain.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnmain.h $Date$ $Revision$ */
/* NetHack 3.5 gnmain.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnmain.h $Date: 2009/05/06 10:57:32 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)gnmain.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnmap.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnmap.c $Date$ $Revision$ */
/* NetHack 3.5 gnmap.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnmap.c $Date: 2009/05/06 10:57:34 $ $Revision: 1.6 $ */
/* SCCS Id: @(#)gnmap.c 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* Copyright (C) 1998 by Anthony Taylor <tonyt@ptialaska.net> */

3
win/gnome/gnmap.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnmap.h $Date$ $Revision$ */
/* NetHack 3.5 gnmap.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnmap.h $Date: 2009/05/06 10:57:35 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)gnmap.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnmenu.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnmenu.c $Date$ $Revision$ */
/* NetHack 3.5 gnmenu.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnmenu.c $Date: 2009/05/06 10:57:36 $ $Revision: 1.6 $ */
/* SCCS Id: @(#)gnmenu.c 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnmenu.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnmenu.h $Date$ $Revision$ */
/* NetHack 3.5 gnmenu.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnmenu.h $Date: 2009/05/06 10:57:39 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)gnmenu.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnmesg.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnmesg.c $Date$ $Revision$ */
/* NetHack 3.5 gnmesg.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnmesg.c $Date: 2009/05/06 10:57:39 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)gnmesg.c 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnmesg.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnmesg.h $Date$ $Revision$ */
/* NetHack 3.5 gnmesg.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnmesg.h $Date: 2009/05/06 10:57:39 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)gnmesg.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnomeprv.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnomeprv.h $Date$ $Revision$ */
/* NetHack 3.5 gnomeprv.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnomeprv.h $Date: 2009/05/06 10:57:40 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)gnomeprv.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnopts.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnopts.c $Date$ $Revision$ */
/* NetHack 3.5 gnopts.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnopts.c $Date: 2009/05/06 10:57:40 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)gnopts.c 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnopts.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnopts.h $Date$ $Revision$ */
/* NetHack 3.5 gnopts.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnopts.h $Date: 2009/05/06 10:57:42 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)gnopts.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnplayer.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnplayer.c $Date$ $Revision$ */
/* NetHack 3.5 gnplayer.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnplayer.c $Date: 2009/05/06 10:57:42 $ $Revision: 1.6 $ */
/* SCCS Id: @(#)gnplayer.c 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnplayer.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnplayer.h $Date$ $Revision$ */
/* NetHack 3.5 gnplayer.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnplayer.h $Date: 2009/05/06 10:57:44 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)gnplayer.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnsignal.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnsignal.c $Date$ $Revision$ */
/* NetHack 3.5 gnsignal.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnsignal.c $Date: 2009/05/06 10:57:45 $ $Revision: 1.7 $ */
/* SCCS Id: @(#)gnsignal.c 3.5 2005/11/19 */
/* Copyright (C) 1998 by Anthony Taylor <tonyt@ptialaska.net> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnsignal.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnsignal.h $Date$ $Revision$ */
/* NetHack 3.5 gnsignal.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnsignal.h $Date: 2009/05/06 10:57:51 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)gnsignal.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Anthony Taylor <tonyt@ptialaska.net> */
/* NetHack may be freely redistributed. See license for details. */

20
win/gnome/gnstatus.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnstatus.c $Date$ $Revision$ */
/* NetHack 3.5 gnstatus.c $NHDT-Date: 1425083083 2015/02/28 00:24:43 $ $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.6 $ */
/* NetHack 3.5 gnstatus.c $Date: 2009/05/06 10:57:54 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)gnstatus.c 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */
@@ -433,9 +434,7 @@ void ghack_status_window_update_stats()
const char* hung;
const char* enc;
static int firstTime=TRUE;
#ifdef GOLDOBJ
long umoney;
#endif
/* First, fill in the player name and the dungeon level */
strcpy(buf, plname);
@@ -564,30 +563,17 @@ void ghack_status_window_update_stats()
gtk_label_set( GTK_LABEL( chaLabel), buf);
/* Now do the non-pixmaped stats (gold and such) */
#ifndef GOLDOBJ
sprintf(buf,"Au:%ld", u.ugold);
if (lastAu < u.ugold && firstTime==FALSE) {
#else
umoney = money_cnt(invent);
sprintf(buf,"Au:%ld", umoney);
if (lastAu < umoney && firstTime==FALSE) {
#endif
/* Ok, this changed so add it to the highlighing list */
ghack_highlight_widget( goldLabel, normalStyle, greenStyle);
}
#ifndef GOLDOBJ
else if (lastAu > u.ugold && firstTime==FALSE) {
#else
else if (lastAu > umoney && firstTime==FALSE) {
#endif
/* Ok, this changed so add it to the highlighing list */
ghack_highlight_widget( goldLabel, normalStyle, redStyle);
}
#ifndef GOLDOBJ
lastAu = u.ugold;
#else
lastAu = umoney;
#endif
gtk_label_set( GTK_LABEL( goldLabel), buf);
if (u.mtimedone) {
@@ -669,7 +655,6 @@ void ghack_status_window_update_stats()
lastAC = u.uac;
gtk_label_set( GTK_LABEL( acLabel), buf);
#ifdef EXP_ON_BOTL
if (flags.showexp) {
sprintf(buf,"Exp:%ld", u.uexp);
if (lastExp < u.uexp && firstTime==FALSE) {
@@ -683,7 +668,6 @@ void ghack_status_window_update_stats()
lastExp = u.uexp;
gtk_label_set( GTK_LABEL( expLabel), buf);
} else
#endif
{
gtk_label_set( GTK_LABEL( expLabel), "");
}

3
win/gnome/gnstatus.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnstatus.h $Date$ $Revision$ */
/* NetHack 3.5 gnstatus.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnstatus.h $Date: 2009/05/06 10:57:57 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)gnstatus.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gntext.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gntext.c $Date$ $Revision$ */
/* NetHack 3.5 gntext.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gntext.c $Date: 2009/05/06 10:58:00 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)gntext.c 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gntext.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gntext.h $Date$ $Revision$ */
/* NetHack 3.5 gntext.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gntext.h $Date: 2009/05/06 10:58:03 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)gntext.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

15
win/gnome/gnworn.c
View File

@@ -1,4 +1,8 @@
/* NetHack 3.5 gnworn.c 2009/05/06 10:58:06 1.3 */
/*
* $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
* $Date: 2012/01/10 17:47:38 $ $Revision: 1.4 $
*/
/* Copyright (C) 2002, Dylan Alex Simon */
/* NetHack may be freely redistributed. See license for details. */
@@ -10,7 +14,6 @@
#define WORN_WIDTH 3
#define WORN_HEIGHT 6
#ifdef TOURIST
#define WORN_OBJECT_LIST /* struct obj *[WORN_HEIGHT][WORN_WIDTH] = */ { \
{ uquiver, uarmh, u.twoweap ? NULL : uswapwep }, \
{ u.twoweap ? uswapwep : NULL, ublindf, uwep }, \
@@ -19,16 +22,6 @@
{ uarmu, uarm, uskin }, \
{ uball, uarmf, uchain } \
}
#else
#define WORN_OBJECT_LIST /* struct obj *[WORN_HEIGHT][WORN_WIDTH] = */ { \
{ uquiver, uarmh, u.twoweap ? NULL : uswapwep }, \
{ u.twoweap ? uswapwep : NULL, ublindf, uwep }, \
{ uleft, uamul, uright }, \
{ uarms, uarmc, uarmg }, \
{ NULL, uarm, uskin }, \
{ uball, uarmf, uchain } \
}
#endif
static GtkWidget *worn_contents[WORN_HEIGHT][WORN_WIDTH];
static struct obj *last_worn_objects[WORN_HEIGHT][WORN_WIDTH];

4
win/gnome/gnworn.h
View File

@@ -1,4 +1,8 @@
/* NetHack 3.5 gnworn.h 2009/05/06 10:58:06 1.3 */
/*
* $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
* $Date: 2012/01/10 17:47:38 $ $Revision: 1.4 $
*/
/* Copyright (C) 2002 by Dylan Alex Simon */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnyesno.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnyesno.c $Date$ $Revision$ */
/* NetHack 3.5 gnyesno.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnyesno.c $Date: 2009/05/06 10:58:06 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)gnyesno.c 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */

3
win/gnome/gnyesno.h
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 gnyesno.h $Date$ $Revision$ */
/* NetHack 3.5 gnyesno.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnyesno.h $Date: 2009/05/06 10:58:08 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)gnyesno.h 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
/* NetHack may be freely redistributed. See license for details. */