Revert "Add tombstone tribute to S.T.P. for 3.6.0"

This reverts commit 64dfb4fcc8.
This commit is contained in:
Sean Hunt
2015-08-03 12:56:32 -04:00
parent 9f0c9b4a0b
commit ff823095ee
9 changed files with 22 additions and 65 deletions

View File

@@ -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) \

View File

@@ -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);

View File

@@ -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:

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -16,7 +16,6 @@ SHELLDIR=$(PREFIX)/games
CFLAGS=-O -I../include
LINK=$(CC)
CFLAGS+=NH360_DEDICATION
WINSRC = $(WINTTYSRC)
WINOBJ = $(WINTTYOBJ)