From ff823095eef89cb359f27e08357e352e81c210d9 Mon Sep 17 00:00:00 2001 From: Sean Hunt Date: Mon, 3 Aug 2015 12:56:32 -0400 Subject: [PATCH] Revert "Add tombstone tribute to S.T.P. for 3.6.0" This reverts commit 64dfb4fcc871d77901f50104594aa79088e71cec. --- src/rip.c | 64 +++++++++++++------------------------- sys/amiga/amirip.c | 16 ---------- sys/unix/hints/linux | 1 - sys/unix/hints/linux-x11 | 1 - sys/unix/hints/macosx | 1 - sys/unix/hints/macosx10.10 | 1 - sys/unix/hints/macosx10.5 | 1 - sys/unix/hints/macosx10.7 | 1 - sys/unix/hints/unix | 1 - 9 files changed, 22 insertions(+), 65 deletions(-) diff --git a/src/rip.c b/src/rip.c index 527396a27..80791cb84 100644 --- a/src/rip.c +++ b/src/rip.c @@ -18,7 +18,27 @@ STATIC_DCL void FDECL(center, (int, char *)); #ifdef TEXT_TOMBSTONE -#ifdef NH320_DEDICATION +#ifndef NH320_DEDICATION +/* A normal tombstone for end of game display. */ +static const char *rip_txt[] = { + " ----------", + " / \\", + " / REST \\", + " / IN \\", + " / PEACE \\", + " / \\", + " | |", /* Name of player */ + " | |", /* Amount of $ */ + " | |", /* Type of death */ + " | |", /* . */ + " | |", /* . */ + " | |", /* . */ + " | 1001 |", /* Real year of death */ + " *| * * * | *", + " _________)/\\\\_//(\\/(/\\)/\\//\\/|_)_______", 0 +}; +#define STONE_LINE_CENT 28 /* char[] element of center of stone face */ +#else /* NH320_DEDICATION */ /* NetHack 3.2.x displayed a dual tombstone as a tribute to Izchak. */ static const char *rip_txt[] = { " ---------- ----------", @@ -39,47 +59,7 @@ static const char *rip_txt[] = { 0 }; #define STONE_LINE_CENT 19 /* char[] element of center of stone face */ -#elif defined(NH360_DEDICATION) -static const char *rip_txt[] = { - " ---------- ----------", - " / \\ / \\", - " / REST \\ / This \\", - " / IN \\ / release of \\", - " / PEACE \\ / NetHack is \\", - " / \\ / dedicated to \\", - " | | | the memory of |", - " | | | |", - " | | | Sir Terry |", - " | | | Pratchett |", - " | | | 1948 - 2015 |", - " | | | Ascended |", - " | 1001 | | |", - " * | * * * | * * | * * * | *", - " _____)/\\|\\__//(\\/(/\\)/\\//\\/|_)________)/|\\\\_/_/(\\/(/\\)/\\/\\/|_)____", - 0 -}; -#define STONE_LINE_CENT 19 /* char[] element of center of stone face */ -#else /* no dedication */ -/* A normal tombstone for end of game display. */ -static const char *rip_txt[] = { - " ----------", - " / \\", - " / REST \\", - " / IN \\", - " / PEACE \\", - " / \\", - " | |", /* Name of player */ - " | |", /* Amount of $ */ - " | |", /* Type of death */ - " | |", /* . */ - " | |", /* . */ - " | |", /* . */ - " | 1001 |", /* Real year of death */ - " *| * * * | *", - " _________)/\\\\_//(\\/(/\\)/\\//\\/|_)_______", 0 -}; -#define STONE_LINE_CENT 28 /* char[] element of center of stone face */ -#endif /* no dedication */ +#endif /* NH320_DEDICATION */ #define STONE_LINE_LEN \ 16 /* # chars that fit on one line \ * (note 1 ' ' border) \ diff --git a/sys/amiga/amirip.c b/sys/amiga/amirip.c index 98d96d306..0c5e02f7a 100644 --- a/sys/amiga/amirip.c +++ b/sys/amiga/amirip.c @@ -245,22 +245,6 @@ time_t when; tomb_text("1935-1994"); tomb_text(""); tomb_text("Ascended"); -#elif defined(NH360_DEDICATION) - /* dedication */ - cno = 1; - tomb_line = TEXT_TOP; - tomb_text("This release"); - tomb_text("of NetHack"); - tomb_text("is dedicated"); - tomb_text("to the"); - tomb_text("memory of"); - tomb_text(""); - tomb_text("Sir Terry"); - tomb_text("Pratchett"); - tomb_text(""); - tomb_text("1948-2015"); - tomb_text(""); - tomb_text("Ascended"); #endif /* Fade from black to full color */ dofade(0, 16, 1); diff --git a/sys/unix/hints/linux b/sys/unix/hints/linux index c270bd9cc..8e50aefc2 100644 --- a/sys/unix/hints/linux +++ b/sys/unix/hints/linux @@ -22,7 +22,6 @@ CFLAGS=-g -O -I../include -DNOTPARMDECL $(CFLAGS1) -DDLB CFLAGS1=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\" CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE CFLAGS+=-DHACKDIR=\"$(HACKDIR)\" -CFLAGS+=NH360_DEDICATION LINK=$(CC) # Only needed for GLIBC stack trace: diff --git a/sys/unix/hints/linux-x11 b/sys/unix/hints/linux-x11 index bd25f1955..4a18a8bd1 100644 --- a/sys/unix/hints/linux-x11 +++ b/sys/unix/hints/linux-x11 @@ -22,7 +22,6 @@ CFLAGS=-O -I../include -DNOTPARMDECL $(CFLAGS1) $(CFLAGS3) CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" CFLAGS1=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\" CFLAGS3=-DX11_GRAPHICS -DDEFAULT_WINDOW_SYS=\"X11\" -DNOTTYGRAPHICS -CFLAGS+=NH360_DEDICATION LINK=$(CC) diff --git a/sys/unix/hints/macosx b/sys/unix/hints/macosx index b3495d1df..b5e159709 100644 --- a/sys/unix/hints/macosx +++ b/sys/unix/hints/macosx @@ -56,7 +56,6 @@ CC=gcc -Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -W CFLAGS=-g -I../include CFLAGS+=-DNOCLIPPING -DNOMAIL -DNOTPARMDECL -DHACKDIR=\"$(HACKDIR)\" CFLAGS+= -DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" -DDLB -CFLAGS+=NH360_DEDICATION ifdef WANT_WIN_TTY WINSRC = $(WINTTYSRC) diff --git a/sys/unix/hints/macosx10.10 b/sys/unix/hints/macosx10.10 index cabdf28bd..ccc166e05 100644 --- a/sys/unix/hints/macosx10.10 +++ b/sys/unix/hints/macosx10.10 @@ -77,7 +77,6 @@ CFLAGS+= -DNOMAIL -DNOTPARMDECL -DHACKDIR=\"$(HACKDIR)\" CFLAGS+= -DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" -DDLB CFLAGS+= -DGREPPATH=\"/usr/bin/grep\" -CFLAGS+=NH360_DEDICATION ifdef WANT_WIN_CHAIN CFLAGS+= -DWINCHAIN diff --git a/sys/unix/hints/macosx10.5 b/sys/unix/hints/macosx10.5 index fcf9f7b11..5c112688f 100644 --- a/sys/unix/hints/macosx10.5 +++ b/sys/unix/hints/macosx10.5 @@ -65,7 +65,6 @@ CFLAGS+=-DNOCLIPPING -DNOMAIL -DNOTPARMDECL -DHACKDIR=\"$(HACKDIR)\" CFLAGS+= -DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" -DDLB CFLAGS+= -DGREPPATH=\"/usr/bin/grep\" -CFLAGS+=NH360_DEDICATION ifdef WANT_WIN_TTY WINSRC = $(WINTTYSRC) diff --git a/sys/unix/hints/macosx10.7 b/sys/unix/hints/macosx10.7 index 71a5866ec..363d11556 100644 --- a/sys/unix/hints/macosx10.7 +++ b/sys/unix/hints/macosx10.7 @@ -75,7 +75,6 @@ CFLAGS+=-g -I../include CFLAGS+= -DNOMAIL -DNOTPARMDECL -DHACKDIR=\"$(HACKDIR)\" CFLAGS+= -DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" -DDLB -CFLAGS+=NH360_DEDICATION CFLAGS+= -DGREPPATH=\"/usr/bin/grep\" ifdef WANT_WIN_CHAIN diff --git a/sys/unix/hints/unix b/sys/unix/hints/unix index b6c8b5a73..b1e8afa3a 100644 --- a/sys/unix/hints/unix +++ b/sys/unix/hints/unix @@ -16,7 +16,6 @@ SHELLDIR=$(PREFIX)/games CFLAGS=-O -I../include LINK=$(CC) -CFLAGS+=NH360_DEDICATION WINSRC = $(WINTTYSRC) WINOBJ = $(WINTTYOBJ)