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

display version and build info at startup (trunk only)

Browse Source 
Tested on the unix port; I've updated as many other ports as I can figure
out but they're not tested.  See window.doc for info on the changed banner
lines.  Also adds the ability to override the generic "Unix" port - used now to get
"MacOSX" into the version line instead of "Unix" (so we don't scare people who don't
know what's going on).
This commit is contained in:
keni
2011-10-11 02:37:31 +00:00
parent bd172eb167
commit 4e5e720334
25 changed files with 82 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes35.0
View File

@@ -527,6 +527,7 @@ when a sokoban puzzle has been completed (last pit or hole filled in),
stop assessing luck penalties and lift most movement restrictions stop assessing luck penalties and lift most movement restrictions
'`' command to show discoveries for one class of objects '`' command to show discoveries for one class of objects
add "about nethack" to '?' menu as an alternate way to view 'v'+'#version' add "about nethack" to '?' menu as an alternate way to view 'v'+'#version'
display version and build information at startup
Platform- and/or Interface-Specific New Features Platform- and/or Interface-Specific New Features

17
doc/window.doc
View File

@@ -875,14 +875,15 @@ VIII. Conventions
init_nhwindows() is expected to display a gee-whiz banner window, including init_nhwindows() is expected to display a gee-whiz banner window, including
the Copyright message. It is recommended that the COPYRIGHT_BANNER_A, the Copyright message. It is recommended that the COPYRIGHT_BANNER_A,
COPYRIGHT_BANNER_B, and COPYRIGHT_BANNER_C macros from patchlevel.h be used COPYRIGHT_BANNER_B, COPYRIGHT_BANNER_C, and COPYRIGHT_BANNER_D macros from
for constructing the Copyright message. COPYRIGHT_BANNER_A is a patchlevel.h and date.h be used for constructing the Copyright message.
quoted string that has the NetHack copyright declaration, COPYRIGHT_BANNER_A is a quoted string that has the NetHack copyright declaration,
COPYRIGHT_BANNER_B is a quoted string that states who the copyright COPYRIGHT_BANNER_B is a quoted string that states who the copyright belongs to,
belongs to, and COPYRIGHT_BANNER_C simply says "See License for COPYRIGHT_BANNER_C is a quoted string generated by makedefs that includes version
details." Be sure to #include "patchlevel.h" to define these macros. and build information. and COPYRIGHT_BANNER_D simply says "See License for details."
Using the macros will prevent having to update the Copyright information Be sure to #include "patchlevel.h" and date.h to define these macros. Using the
in each window-port prior to each release. macros will prevent having to update the Copyright information in each window-port
prior to each release.
Ports (MSDOS, TOS, MAC, etc) _may_ use window-port specific routines in Ports (MSDOS, TOS, MAC, etc) _may_ use window-port specific routines in
their port specific files, _AT_THEIR_OWN_RISK_. Since "port" and their port specific files, _AT_THEIR_OWN_RISK_. Since "port" and

10
include/global.h
View File

@@ -191,6 +191,9 @@ typedef char nhptext;
# ifdef MAC # ifdef MAC
# define PORT_ID "Mac" # define PORT_ID "Mac"
# endif # endif
# ifdef __APPLE__
# define PORT_ID "MacOSX"
# endif
# ifdef MSDOS # ifdef MSDOS
# ifdef PC9800 # ifdef PC9800
# define PORT_ID "PC-9800" # define PORT_ID "PC-9800"
@@ -213,8 +216,11 @@ typedef char nhptext;
# ifdef TOS # ifdef TOS
# define PORT_ID "ST" # define PORT_ID "ST"
# endif # endif
# ifdef UNIX /* Check again in case something more specific has been defined above. */
# define PORT_ID "Unix" # ifndef PORT_ID
# ifdef UNIX
# define PORT_ID "Unix"
# endif
# endif # endif
# ifdef VMS # ifdef VMS
# define PORT_ID "VMS" # define PORT_ID "VMS"

5
include/patchlevel.h
View File

@@ -17,11 +17,10 @@
#define COPYRIGHT_BANNER_A \ #define COPYRIGHT_BANNER_A \
"NetHack, Copyright 1985-2011" "NetHack, Copyright 1985-2011"
#define COPYRIGHT_BANNER_B \ #define COPYRIGHT_BANNER_B \
" By Stichting Mathematisch Centrum and M. Stephenson." " By Stichting Mathematisch Centrum and M. Stephenson."
/* COPYRIGHT_BANNER_C is generated by makedefs into date.h */
#define COPYRIGHT_BANNER_C \ #define COPYRIGHT_BANNER_D \
" See license for details." " See license for details."
/* /*

4
src/restore.c
View File

@@ -1276,8 +1276,8 @@ winid bannerwin; /* if not WIN_ERR, clear window and show copyright in menu */
if (bannerwin != WIN_ERR) { if (bannerwin != WIN_ERR) {
/* for tty; erase copyright notice and redo it in the menu */ /* for tty; erase copyright notice and redo it in the menu */
clear_nhwindow(bannerwin); clear_nhwindow(bannerwin);
/* COPYRIGHT_BANNER_A, COPYRIGHT_BANNER_B, COPYRIGHT_BANNER_C */ /* COPYRIGHT_BANNER_[ABCD] */
for (k = 1; k <= 3; ++k) for (k = 1; k <= 4; ++k)
add_menu(tmpwin, NO_GLYPH, &any, 0, 0, add_menu(tmpwin, NO_GLYPH, &any, 0, 0,
ATR_NONE, copyright_banner_line(k), MENU_UNSELECTED); ATR_NONE, copyright_banner_line(k), MENU_UNSELECTED);
add_menu(tmpwin, NO_GLYPH, &any, 0, 0, add_menu(tmpwin, NO_GLYPH, &any, 0, 0,

2
sys/amiga/Makefile.agc
View File

@@ -1244,7 +1244,7 @@ $(O)termcap.o: $(TTY)termcap.c $(HDEP) $(I)wintty.h $(I)tcap.h
$(O)topl.o: $(TTY)topl.c $(HDEP) $(I)wintty.h $(I)tcap.h $(O)topl.o: $(TTY)topl.c $(HDEP) $(I)wintty.h $(I)tcap.h
$(O)wintty.o: $(TTY)wintty.c $(HDEP) $(I)wintty.h $(I)tcap.h \ $(O)wintty.o: $(TTY)wintty.c $(HDEP) $(I)wintty.h $(I)tcap.h \
$(I)patchlevel.h $(I)date.h $(I)patchlevel.h
$(O)amitty.o: $(AMI)amitty.c $(HDEP) $(O)amitty.o: $(AMI)amitty.c $(HDEP)

2
sys/amiga/Makefile.ami
View File

@@ -1583,7 +1583,7 @@ $(O)termcap.o: $(TTY)termcap.c $(HDEP) $(I)wintty.h $(I)tcap.h
$(O)topl.o: $(TTY)topl.c $(HDEP) $(I)wintty.h $(I)tcap.h $(O)topl.o: $(TTY)topl.c $(HDEP) $(I)wintty.h $(I)tcap.h
$(O)wintty.o: $(TTY)wintty.c $(HDEP) $(I)wintty.h $(I)tcap.h \ $(O)wintty.o: $(TTY)wintty.c $(HDEP) $(I)wintty.h $(I)tcap.h \
$(I)patchlevel.h $(I)date.h $(I)patchlevel.h
$(O)amitty.o: $(AMI)amitty.c $(HDEP) $(O)amitty.o: $(AMI)amitty.c $(HDEP)

2
sys/amiga/winfuncs.c
View File

@@ -7,6 +7,7 @@
#include "NH:sys/amiga/winext.h" #include "NH:sys/amiga/winext.h"
#include "NH:sys/amiga/winproto.h" #include "NH:sys/amiga/winproto.h"
#include "patchlevel.h" #include "patchlevel.h"
#include "date.h"
extern struct TagItem scrntags[]; extern struct TagItem scrntags[];
@@ -1304,6 +1305,7 @@ amii_init_nhwindows(argcp,argv)
amii_putstr( WIN_BASE, 0, COPYRIGHT_BANNER_A); amii_putstr( WIN_BASE, 0, COPYRIGHT_BANNER_A);
amii_putstr( WIN_BASE, 0, COPYRIGHT_BANNER_B); amii_putstr( WIN_BASE, 0, COPYRIGHT_BANNER_B);
amii_putstr( WIN_BASE, 0, COPYRIGHT_BANNER_C); amii_putstr( WIN_BASE, 0, COPYRIGHT_BANNER_C);
amii_putstr( WIN_BASE, 0, COPYRIGHT_BANNER_D);
amii_putstr( WIN_BASE, 0, ""); amii_putstr( WIN_BASE, 0, "");
Initialized = 1; Initialized = 1;

2
sys/msdos/Makefile.BC
View File

@@ -1629,7 +1629,7 @@ $(O)topl.B: $(PCHB) $(WTTY)\topl.c $(HACK_H) $(TERMCAP_H) $(WINTTY_H)
@echo $(BCOPTS2) $(CFLAGUB) >> $(VROOMMCFG) @echo $(BCOPTS2) $(CFLAGUB) >> $(VROOMMCFG)
$(CC) $(FLAGUB) $(COBJNAM)$@ $(WTTY)\topl.c $(CC) $(FLAGUB) $(COBJNAM)$@ $(WTTY)\topl.c
$(O)wintty.o: $(PCHO) $(CONFIG_H) $(WTTY)\wintty.c $(PATCHLEVEL_H) $(O)wintty.o: $(PCHO) $(CONFIG_H) $(WTTY)\wintty.c $(PATCHLEVEL_H) $(DATE_H)
@type schema$(SCHEMA).bc | find "$(@B)_o" > $(VROOMMCFG) @type schema$(SCHEMA).bc | find "$(@B)_o" > $(VROOMMCFG)
@echo $(BCOPTS1) >> $(VROOMMCFG) @echo $(BCOPTS1) >> $(VROOMMCFG)
@echo $(BCOPTS2) $(CFLAGUO) >> $(VROOMMCFG) @echo $(BCOPTS2) $(CFLAGUO) >> $(VROOMMCFG)

2
sys/msdos/Makefile.GCC
View File

@@ -1068,7 +1068,7 @@ $(O)termcap.o: ../win/tty/termcap.c $(HACK_H) $(INCL)/tcap.h
$(O)topl.o: ../win/tty/topl.c $(HACK_H) $(INCL)/tcap.h $(O)topl.o: ../win/tty/topl.c $(HACK_H) $(INCL)/tcap.h
$(CC) $(cflags) -o$@ ../win/tty/topl.c $(CC) $(cflags) -o$@ ../win/tty/topl.c
$(O)wintty.o: ../win/tty/wintty.c $(HACK_H) $(INCL)/dlb.h \ $(O)wintty.o: ../win/tty/wintty.c $(HACK_H) $(INCL)/dlb.h \
$(PATCHLEV_H) $(INCL)/tcap.h $(INCL)/date.h $(PATCHLEV_H) $(INCL)/tcap.h
$(CC) $(cflags) -o$@ ../win/tty/wintty.c $(CC) $(cflags) -o$@ ../win/tty/wintty.c
$(O)Window.o: ../win/X11/Window.c $(INCL)/xwindowp.h $(INCL)/xwindow.h \ $(O)Window.o: ../win/X11/Window.c $(INCL)/xwindowp.h $(INCL)/xwindow.h \
$(CONFIG_H) $(CONFIG_H)

2
sys/msdos/Makefile.MSC
View File

@@ -988,7 +988,7 @@ termcap.o: $(WIN)\termcap.c $(HACK_H) $(INCL)\tcap.h
topl.o: $(WIN)\topl.c $(HACK_H) $(INCL)\tcap.h topl.o: $(WIN)\topl.c $(HACK_H) $(INCL)\tcap.h
@$(CC) $(CFLAGS) $(SPECOPTS) /Fo$@ $(WIN)\topl.c @$(CC) $(CFLAGS) $(SPECOPTS) /Fo$@ $(WIN)\topl.c
wintty.o: $(WIN)\wintty.c $(HACK_H) $(INCL)\dlb.h \ wintty.o: $(WIN)\wintty.c $(HACK_H) $(INCL)\dlb.h \
$(INCL)\patchlev.h $(INCL)\tcap.h $(INCL)\date.h $(INCL)\patchlev.h $(INCL)\tcap.h
@$(CC) $(CFLAGS) $(SPECOPTS) /Fo$@ $(WIN)\wintty.c @$(CC) $(CFLAGS) $(SPECOPTS) /Fo$@ $(WIN)\wintty.c
# src dependencies # src dependencies

2
sys/os2/Makefile.os2
View File

@@ -1240,7 +1240,7 @@ $(OBJ)\termcap.o : $(WIN)\$(CB) $(HACK_H) $(INCL)\tcap.h
$(WINCC) $(WINCC)
$(OBJ)\topl.o : $(WIN)\$(CB) $(HACK_H) $(INCL)\tcap.h $(OBJ)\topl.o : $(WIN)\$(CB) $(HACK_H) $(INCL)\tcap.h
$(WINCC) $(WINCC)
$(OBJ)\wintty.o : $(WIN)\$(CB) $(HACK_H) $(INCL)\tcap.h $(OBJ)\wintty.o : $(WIN)\$(CB) $(HACK_H) $(INCL)\tcap.h $(INCL)\date.h
$(WINCC) $(WINCC)
# #

5
sys/share/pcmain.c
View File

@@ -6,6 +6,7 @@
#include "hack.h" #include "hack.h"
#include "dlb.h" #include "dlb.h"
#include "date.h"
#ifdef SHORT_FILENAMES #ifdef SHORT_FILENAMES
#include "patchlev.h" #include "patchlev.h"
#else #else
@@ -278,9 +279,9 @@ char *argv[];
error("Your clock is incorrectly set!"); error("Your clock is incorrectly set!");
#endif #endif
if (!dlb_init()) { if (!dlb_init()) {
pline("%s\n%s\n%s\n\nNetHack was unable to open the required file \"%s\".%s", pline("%s\n%s\n%s\n%s\n\nNetHack was unable to open the required file \"%s\".%s",
COPYRIGHT_BANNER_A, COPYRIGHT_BANNER_B, COPYRIGHT_BANNER_A, COPYRIGHT_BANNER_B,
COPYRIGHT_BANNER_C, DLBFILE, COPYRIGHT_BANNER_C, COPYRIGHT_BANNER_D, DLBFILE,
#ifdef WIN32 #ifdef WIN32
"\nAre you perhaps trying to run NetHack within a zip utility?"); "\nAre you perhaps trying to run NetHack within a zip utility?");
#else #else

2
sys/unix/Makefile.src
View File

@@ -612,7 +612,7 @@ termcap.o: ../win/tty/termcap.c $(HACK_H) ../include/tcap.h
topl.o: ../win/tty/topl.c $(HACK_H) ../include/tcap.h topl.o: ../win/tty/topl.c $(HACK_H) ../include/tcap.h
$(CC) $(CFLAGS) -c ../win/tty/topl.c $(CC) $(CFLAGS) -c ../win/tty/topl.c
wintty.o: ../win/tty/wintty.c $(HACK_H) ../include/dlb.h \ wintty.o: ../win/tty/wintty.c $(HACK_H) ../include/dlb.h \
../include/patchlevel.h ../include/tcap.h ../include/date.h ../include/patchlevel.h ../include/tcap.h
$(CC) $(CFLAGS) -c ../win/tty/wintty.c $(CC) $(CFLAGS) -c ../win/tty/wintty.c
Window.o: ../win/X11/Window.c ../include/xwindowp.h ../include/xwindow.h \ Window.o: ../win/X11/Window.c ../include/xwindowp.h ../include/xwindow.h \
$(CONFIG_H) $(CONFIG_H)

2
sys/vms/Makefile.src
View File

@@ -352,7 +352,7 @@ getline.obj : $(TTY)getline.c $(HACK_H) $(INC)func_tab.h
termcap.obj : $(TTY)termcap.c $(HACK_H) $(INC)tcap.h termcap.obj : $(TTY)termcap.c $(HACK_H) $(INC)tcap.h
topl.obj : $(TTY)topl.c $(HACK_H) $(INC)tcap.h topl.obj : $(TTY)topl.c $(HACK_H) $(INC)tcap.h
wintty.obj : $(TTY)wintty.c $(HACK_H) $(INC)dlb.h \ wintty.obj : $(TTY)wintty.c $(HACK_H) $(INC)dlb.h \
$(INC)patchlevel.h $(INC)tcap.h $(INC)date.h $(INC)patchlevel.h $(INC)tcap.h
Window.obj : $(X11)Window.c $(INC)xwindowp.h $(INC)xwindow.h $(CONFIG_H) Window.obj : $(X11)Window.c $(INC)xwindowp.h $(INC)xwindow.h $(CONFIG_H)
dialogs.obj : $(X11)dialogs.c $(CONFIG_H) dialogs.obj : $(X11)dialogs.c $(CONFIG_H)
winX.obj : $(X11)winX.c $(HACK_H) $(INC)winX.h $(INC)dlb.h \ winX.obj : $(X11)winX.c $(HACK_H) $(INC)winX.h $(INC)dlb.h \

2
sys/wince/bootstrp.mak
View File

@@ -679,7 +679,7 @@ $(O)termcap.o: ..\win\tty\termcap.c $(HACK_H) $(INCL)\tcap.h
$(O)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h $(O)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h
$(CC) $(CFLAGSU) -Fo$@ ..\win\tty\topl.c $(CC) $(CFLAGSU) -Fo$@ ..\win\tty\topl.c
$(O)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h \ $(O)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h \
$(INCL)\patchlevel.h $(INCL)\tcap.h $(INCL)\date.h $(INCL)\patchlevel.h $(INCL)\tcap.h
$(CC) $(CFLAGSU) -Fo$@ ..\win\tty\wintty.c $(CC) $(CFLAGSU) -Fo$@ ..\win\tty\wintty.c
$(O)Window.o: ..\win\X11\Window.c $(INCL)\xwindowp.h $(INCL)\xwindow.h \ $(O)Window.o: ..\win\X11\Window.c $(INCL)\xwindowp.h $(INCL)\xwindow.h \
$(CONFIG_H) $(CONFIG_H)

4
sys/wince/mhmain.c
View File

@@ -11,6 +11,7 @@
#include "mhmsgwnd.h" #include "mhmsgwnd.h"
#include "mhcmd.h" #include "mhcmd.h"
#include "mhmap.h" #include "mhmap.h"
#include "date.h"
#include "patchlevel.h" #include "patchlevel.h"
#define MAX_LOADSTRING 100 #define MAX_LOADSTRING 100
@@ -996,7 +997,8 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
NH_A2W( NH_A2W(
COPYRIGHT_BANNER_A "\n" COPYRIGHT_BANNER_A "\n"
COPYRIGHT_BANNER_B "\n" COPYRIGHT_BANNER_B "\n"
COPYRIGHT_BANNER_C, COPYRIGHT_BANNER_C "\n"
COPYRIGHT_BANNER_D,
wbuf, wbuf,
NHSTR_BUFSIZE NHSTR_BUFSIZE
) ); ) );

2
sys/winnt/Makefile.bcc
View File

@@ -1176,7 +1176,7 @@ $(O)termcap.o: ..\win\tty\termcap.c $(HACK_H) $(INCL)\tcap.h
$(O)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h $(O)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h
$(cc) $(CFLAGS) -o$@ ..\win\tty\topl.c $(cc) $(CFLAGS) -o$@ ..\win\tty\topl.c
$(O)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h \ $(O)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h \
$(INCL)\patchlevel.h $(INCL)\tcap.h $(INCL)\date.h $(INCL)\patchlevel.h $(INCL)\tcap.h
$(cc) $(CFLAGS) -o$@ ..\win\tty\wintty.c $(cc) $(CFLAGS) -o$@ ..\win\tty\wintty.c
$(O)Window.o: ..\win\X11\Window.c $(INCL)\xwindowp.h $(INCL)\xwindow.h \ $(O)Window.o: ..\win\X11\Window.c $(INCL)\xwindowp.h $(INCL)\xwindow.h \
$(CONFIG_H) $(CONFIG_H)

2
sys/winnt/Makefile.gcc
View File

@@ -1142,7 +1142,7 @@ $(O)termcap.o: ../win/tty/termcap.c $(HACK_H) $(INCL)/tcap.h
$(O)topl.o: ../win/tty/topl.c $(HACK_H) $(INCL)/tcap.h $(O)topl.o: ../win/tty/topl.c $(HACK_H) $(INCL)/tcap.h
$(cc) $(CFLAGS) -o$@ ../win/tty/topl.c $(cc) $(CFLAGS) -o$@ ../win/tty/topl.c
$(O)wintty.o: ../win/tty/wintty.c $(HACK_H) $(INCL)/dlb.h \ $(O)wintty.o: ../win/tty/wintty.c $(HACK_H) $(INCL)/dlb.h \
$(INCL)/patchlevel.h $(INCL)/tcap.h $(INCL)/date.h $(INCL)/patchlevel.h $(INCL)/tcap.h
$(cc) $(CFLAGS) -o$@ ../win/tty/wintty.c $(cc) $(CFLAGS) -o$@ ../win/tty/wintty.c
$(O)Window.o: ../win/X11/Window.c $(INCL)/xwindowp.h $(INCL)/xwindow.h \ $(O)Window.o: ../win/X11/Window.c $(INCL)/xwindowp.h $(INCL)/xwindow.h \
$(CONFIG_H) $(CONFIG_H)

2
sys/winnt/Makefile.msc
View File

@@ -1250,7 +1250,7 @@ $(O)termcap.o: ..\win\tty\termcap.c $(HACK_H) $(INCL)\tcap.h
$(O)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h $(O)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h
@$(CC) $(cflagsUtil) -Fo$@ ..\win\tty\topl.c @$(CC) $(cflagsUtil) -Fo$@ ..\win\tty\topl.c
$(O)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h \ $(O)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h \
$(INCL)\patchlevel.h $(INCL)\tcap.h $(INCL)\date.h $(INCL)\patchlevel.h $(INCL)\tcap.h
@$(CC) $(cflagsUtil) -Fo$@ ..\win\tty\wintty.c @$(CC) $(cflagsUtil) -Fo$@ ..\win\tty\wintty.c
$(O)Window.o: ..\win\X11\Window.c $(INCL)\xwindowp.h $(INCL)\xwindow.h \ $(O)Window.o: ..\win\X11\Window.c $(INCL)\xwindowp.h $(INCL)\xwindow.h \
$(CONFIG_H) $(CONFIG_H)

30
util/makedefs.c
View File

@@ -165,6 +165,7 @@ extern void NDECL(objects_init); /* objects.c */
static void NDECL(make_version); static void NDECL(make_version);
static char *FDECL(version_string, (char *, const char *)); static char *FDECL(version_string, (char *, const char *));
static char *FDECL(version_id_string, (char *,const char *)); static char *FDECL(version_id_string, (char *,const char *));
static char *FDECL(bannerc_string, (char *,const char *));
static char *FDECL(xcrypt, (const char *)); static char *FDECL(xcrypt, (const char *));
static int FDECL(check_control, (char *)); static int FDECL(check_control, (char *));
static char *FDECL(without_control, (char *)); static char *FDECL(without_control, (char *));
@@ -1097,6 +1098,33 @@ const char *build_date;
return outbuf; return outbuf;
} }
static char *
bannerc_string(outbuf, build_date)
char *outbuf;
const char *build_date;
{
char subbuf[64], versbuf[64];
subbuf[0] = '\0';
#ifdef PORT_SUB_ID
subbuf[0] = ' ';
Strcpy(&subbuf[1], PORT_SUB_ID);
#endif
#ifdef BETA
Strcat(subbuf, " Beta");
#endif
Sprintf(outbuf, " Version %s %s%s, built %s.",
version_string(versbuf, "."),
PORT_ID, subbuf, &build_date[4]);
#if 0
Sprintf(outbuf, "%s NetHack%s %s Copyright 1985-%s (built %s)",
PORT_ID, subbuf, version_string(versbuf,"."), RELEASE_YEAR,
&build_date[4]);
#endif
return outbuf;
}
void void
do_date() do_date()
{ {
@@ -1158,6 +1186,8 @@ do_date()
Fprintf(ofp,"#define VERSION_STRING \"%s\"\n", version_string(buf,".")); Fprintf(ofp,"#define VERSION_STRING \"%s\"\n", version_string(buf,"."));
Fprintf(ofp,"#define VERSION_ID \\\n \"%s\"\n", Fprintf(ofp,"#define VERSION_ID \\\n \"%s\"\n",
version_id_string(buf, cbuf)); version_id_string(buf, cbuf));
Fprintf(ofp,"#define COPYRIGHT_BANNER_C \\\n \"%s\"\n",
bannerc_string(buf, cbuf));
Fprintf(ofp,"\n"); Fprintf(ofp,"\n");
#ifdef AMIGA #ifdef AMIGA
{ {

2
win/X11/winX.c
View File

@@ -55,6 +55,7 @@
#else #else
#include "patchlevel.h" #include "patchlevel.h"
#endif #endif
#include "date.h"
#ifndef NO_SIGNAL #ifndef NO_SIGNAL
#include <signal.h> #include <signal.h>
@@ -995,6 +996,7 @@ char** argv;
COPYRIGHT_BANNER_A, COPYRIGHT_BANNER_A,
COPYRIGHT_BANNER_B, COPYRIGHT_BANNER_B,
COPYRIGHT_BANNER_C, COPYRIGHT_BANNER_C,
COPYRIGHT_BANNER_D,
"", "",
"", "",
0 0

2
win/tty/wintty.c
View File

@@ -11,6 +11,7 @@
#include "hack.h" #include "hack.h"
#include "dlb.h" #include "dlb.h"
#include "date.h"
#ifdef SHORT_FILENAMES #ifdef SHORT_FILENAMES
#include "patchlev.h" #include "patchlev.h"
#else #else
@@ -351,6 +352,7 @@ char** argv;
tty_putstr(BASE_WINDOW, 0, COPYRIGHT_BANNER_A); tty_putstr(BASE_WINDOW, 0, COPYRIGHT_BANNER_A);
tty_putstr(BASE_WINDOW, 0, COPYRIGHT_BANNER_B); tty_putstr(BASE_WINDOW, 0, COPYRIGHT_BANNER_B);
tty_putstr(BASE_WINDOW, 0, COPYRIGHT_BANNER_C); tty_putstr(BASE_WINDOW, 0, COPYRIGHT_BANNER_C);
tty_putstr(BASE_WINDOW, 0, COPYRIGHT_BANNER_D);
tty_putstr(BASE_WINDOW, 0, ""); tty_putstr(BASE_WINDOW, 0, "");
tty_display_nhwindow(BASE_WINDOW, FALSE); tty_display_nhwindow(BASE_WINDOW, FALSE);
} }

4
win/win32/mhmain.c
View File

@@ -5,6 +5,7 @@
#include "winMS.h" #include "winMS.h"
#include <commdlg.h> #include <commdlg.h>
#include "date.h"
#include "patchlevel.h" #include "patchlevel.h"
#include "resource.h" #include "resource.h"
#include "mhmsg.h" #include "mhmsg.h"
@@ -986,7 +987,8 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
NH_A2W( NH_A2W(
COPYRIGHT_BANNER_A "\n" COPYRIGHT_BANNER_A "\n"
COPYRIGHT_BANNER_B "\n" COPYRIGHT_BANNER_B "\n"
COPYRIGHT_BANNER_C, COPYRIGHT_BANNER_C "\n"
COPYRIGHT_BANNER_D,
wbuf, wbuf,
BUFSZ BUFSZ
) ); ) );

5
win/win32/mhsplash.c
View File

@@ -8,6 +8,7 @@
#include "mhsplash.h" #include "mhsplash.h"
#include "mhmsg.h" #include "mhmsg.h"
#include "mhfont.h" #include "mhfont.h"
#include "date.h"
#include "patchlevel.h" #include "patchlevel.h"
#include "dlb.h" #include "dlb.h"
@@ -85,8 +86,8 @@ void mswin_display_splash_window (BOOL show_ver)
clientrt.right - 2 * SPLASH_OFFSET_X, controlrt.bottom, TRUE); clientrt.right - 2 * SPLASH_OFFSET_X, controlrt.bottom, TRUE);
/* Fill the text control */ /* Fill the text control */
Sprintf (buf, "%s\r\n%s\r\n%s\r\n\r\n", COPYRIGHT_BANNER_A, COPYRIGHT_BANNER_B, Sprintf (buf, "%s\r\n%s\r\n%s\r\n%s\r\n\r\n", COPYRIGHT_BANNER_A, COPYRIGHT_BANNER_B,
COPYRIGHT_BANNER_C); COPYRIGHT_BANNER_C, COPYRIGHT_BANNER_D);
strsize = strlen(buf); strsize = strlen(buf);
if (show_ver) { if (show_ver) {