From 676df2da62daa0e5b5be0d4ba6bd0447db9d2db2 Mon Sep 17 00:00:00 2001 From: "nethack.allison" Date: Thu, 26 Dec 2002 17:14:34 +0000 Subject: [PATCH] more beta BETA_INFO was being used in win32 code but it is only defined in version.c --- src/version.c | 15 +++++++-------- win/win32/mhsplash.c | 6 ------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/version.c b/src/version.c index e859296d3..961cd5b37 100644 --- a/src/version.c +++ b/src/version.c @@ -14,14 +14,18 @@ #include "patchlevel.h" #endif -#define BETA_INFO " [beta16]" +#define BETA_INFO "[beta16]" /* fill and return the given buffer with the nethack version string */ char * getversionstring(buf) char *buf; { - return strcpy(buf, VERSION_ID); + Strcpy(buf, VERSION_ID); +#if defined(BETA) && defined(BETA_INFO) + Sprintf(eos(buf), " %s", BETA_INFO); +#endif + return buf; } int @@ -29,12 +33,7 @@ doversion() { char buf[BUFSZ]; - pline("%s%s", getversionstring(buf), -#if defined(BETA) && defined(BETA_INFO) - BETA_INFO); -#else - ""); -#endif + pline("%s", getversionstring(buf)); return 0; } diff --git a/win/win32/mhsplash.c b/win/win32/mhsplash.c index 36a6349c8..8fb2075cd 100644 --- a/win/win32/mhsplash.c +++ b/win/win32/mhsplash.c @@ -85,12 +85,6 @@ void mswin_display_splash_window (BOOL show_ver) char buf[BUFSZ]; getversionstring(buf); - sprintf(eos(buf), "%s", -#if defined(BETA) && defined(BETA_INFO) - BETA_INFO); -#else - ""); -#endif SetWindowText(GetDlgItem(hWnd, IDC_EXTRAINFO), buf); } else {