X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconfig.c;h=608b066ed64f89aa3ed42b81a0e9a24a8965de0f;hp=e44e8348c25a946890cb6d291dad8ef9ba398a75;hb=0d214d4e314f6f42df24be140bb433e980319767;hpb=abe44529b439ad39b4d8dbf19cbd67c9b9844279

diff --git a/src/config.c b/src/config.c
index e44e8348..608b066e 100644
--- a/src/config.c
+++ b/src/config.c
@@ -15,126 +15,81 @@
 #include "conftime.h"
 
 
-#define USE_EXTENDED_VERSION	1
-
-
-char *getCompileDateString()
+char *getSourceDateString()
 {
-  return COMPILE_DATE_STRING;
+  return SOURCE_DATE_STRING;
 }
 
-char *getProgramReleaseVersionString()
+char *getProgramTitleString()
 {
-  static char program_version_string[32];
-
-#if USE_EXTENDED_VERSION
-  sprintf(program_version_string, "%d.%d.%d.%d",
-	  PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH,
-	  PROGRAM_VERSION_BUILD);
-#else
-  sprintf(program_version_string, "%d.%d.%d",
-	  PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH);
-#endif
-
-  return program_version_string;
+  return program.program_title;
 }
 
-char *getProgramFullVersionString()
+char *getProgramVersionString()
 {
   static char program_version_string[32];
 
-#if USE_EXTENDED_VERSION
-  sprintf(program_version_string, "%d.%d.%d.%d",
+  sprintf(program_version_string, "%d.%d.%d.%d%s",
 	  PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH,
-	  PROGRAM_VERSION_BUILD);
-#else
-  sprintf(program_version_string, "%d.%d.%d-%d",
-	  PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH,
-	  PROGRAM_VERSION_BUILD);
-#endif
+	  PROGRAM_VERSION_BUILD, PROGRAM_VERSION_EXTRA);
 
   return program_version_string;
 }
 
-char *getProgramVersionString()
-{
-#ifdef DEBUG
-  return getProgramFullVersionString();
-#else
-  return getProgramReleaseVersionString();
-#endif
-}
-
 char *getProgramInitString()
 {
   static char *program_init_string = NULL;
 
-#if 1
-  // do not display compile target anymore, as it is almost always "SDL" now
   if (program_init_string == NULL)
   {
-    program_init_string = checked_malloc(strlen(PROGRAM_TITLE_STRING) + 1 +
+    program_init_string = checked_malloc(strlen(getProgramTitleString()) + 1 +
 					 strlen(getProgramVersionString()) + 1);
 
     sprintf(program_init_string, "%s %s",
-	    PROGRAM_TITLE_STRING, getProgramVersionString());
-  }
-#else
-  if (program_init_string == NULL)
-  {
-    program_init_string = checked_malloc(strlen(PROGRAM_TITLE_STRING) + 1 +
-					 strlen(getProgramVersionString()) + 1 +
-					 strlen(TARGET_STRING) + 1);
-
-    sprintf(program_init_string, "%s %s %s",
-	    PROGRAM_TITLE_STRING, getProgramVersionString(), TARGET_STRING);
+	    getProgramTitleString(), getProgramVersionString());
   }
-#endif
 
   return program_init_string;
 }
 
 char *getWindowTitleString()
 {
-#if 1
   static char *window_title_string = NULL;
 
   checked_free(window_title_string);
 
+#if defined(TARGET_SDL2)
+
 #ifdef DEBUG
   window_title_string = checked_malloc(strlen(getProgramInitString()) + 20 +
-				       strlen(getCompileDateString()) + 2 + 1);
+				       strlen(getSourceDateString()) + 2 + 1);
 
   sprintf(window_title_string, "%s (%d %%) [%s]",
-	  getProgramInitString(), setup.window_scaling_percent,
-	  getCompileDateString());
+	  getProgramInitString(), video.window_scaling_percent,
+	  getSourceDateString());
 #else
   window_title_string = checked_malloc(strlen(getProgramInitString()) + 20);
 
   sprintf(window_title_string, "%s (%d %%)",
-	  getProgramInitString(), setup.window_scaling_percent);
+	  getProgramInitString(), video.window_scaling_percent);
 #endif
 
-  return window_title_string;
-
 #else
 
 #ifdef DEBUG
-  static char *window_title_string = NULL;
-
-  if (window_title_string == NULL)
-  {
-    window_title_string = checked_malloc(strlen(getProgramInitString()) + 1 +
-					 strlen(getCompileDateString()) + 2 +1);
-
-    sprintf(window_title_string, "%s [%s]",
-	    getProgramInitString(), getCompileDateString());
-  }
+  window_title_string = checked_malloc(strlen(getProgramInitString()) + 1 +
+				       strlen(getSourceDateString()) + 2 + 1);
 
-  return window_title_string;
+  sprintf(window_title_string, "%s [%s]",
+	  getProgramInitString(), getSourceDateString());
 #else
-  return getProgramInitString();
+  window_title_string = checked_malloc(strlen(getProgramInitString()) + 1);
+
+  sprintf(window_title_string, "%s",
+	  getProgramInitString());
 #endif
 
 #endif
+
+  return window_title_string;
 }