From 223d5ea56f41b5723c86511e40a3a9fb2fe7e826 Mon Sep 17 00:00:00 2001 From: gewlitys Date: Mon, 28 Oct 2002 23:40:29 +0000 Subject: [PATCH] some fixes to previous commit git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@179 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/options.h | 1 - sc2/src/sc2code/libs/graphics/sdl/sdl_common.c | 4 +++- sc2/src/starcon2.c | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sc2/src/options.h b/sc2/src/options.h index 8aa6f38f2..e822a0dda 100644 --- a/sc2/src/options.h +++ b/sc2/src/options.h @@ -25,7 +25,6 @@ #define UQM_MAJOR_VERSION 0 #define UQM_MINOR_VERSION 1 -char UQM_VERSION_STRING[1000]; enum { diff --git a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c b/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c index 1e88d2a78..3a3c33c1b 100644 --- a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c +++ b/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c @@ -44,6 +44,7 @@ int TFB_InitGraphics (int driver, int flags, int width, int height, int bpp) { int result; + char caption[200]; if (bpp != 15 && bpp != 16 && bpp != 24 && bpp != 32) { @@ -69,7 +70,8 @@ TFB_InitGraphics (int driver, int flags, int width, int height, int bpp) } SDL_EnableUNICODE (1); - SDL_WM_SetCaption (UQM_VERSION_STRING, NULL); + sprintf (caption, "The Ur-Quan Masters v%d.%d", UQM_MAJOR_VERSION, UQM_MINOR_VERSION); + SDL_WM_SetCaption (caption, NULL); if (flags & TFB_GFXFLAGS_SHOWFPS) ShowFPS = TRUE; diff --git a/sc2/src/starcon2.c b/sc2/src/starcon2.c index ee61683e0..7b416f188 100644 --- a/sc2/src/starcon2.c +++ b/sc2/src/starcon2.c @@ -79,8 +79,7 @@ main (int argc, char *argv[]) {0, 0, 0, 0} }; - sprintf (UQM_VERSION_STRING, "The Ur-Quan Masters v%d.%d (compiled %s %s)", UQM_MAJOR_VERSION, UQM_MINOR_VERSION, __DATE__, __TIME__); - fprintf (stderr, "%s\n", UQM_VERSION_STRING); + fprintf (stderr, "The Ur-Quan Masters v%d.%d (compiled %s %s)\n", UQM_MAJOR_VERSION, UQM_MINOR_VERSION, __DATE__, __TIME__); #ifndef WIN32 strcpy (contentdir, "content");