X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconfig.c;h=8a92ebb445cce90a857ad67794d2dd654ce6cb79;hp=bb1c6ee4a7d1154a0e2fce8295394088e934332c;hb=5c6c42f1;hpb=3c53030b9e20c59004046274e94eff2ee90d0ab5

diff --git a/src/config.c b/src/config.c
index bb1c6ee4..8a92ebb4 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,15 +1,13 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2006 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* config.c                                                 *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//     		    Holger Schemel
+//		    info@artsoft.org
+//		    http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// config.c
+// ============================================================================
 
 #include "libgame/libgame.h"
 
@@ -17,101 +15,95 @@
 #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 *getProgramRealVersionString()
 {
   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
+  return program.version_string;
 }
 
 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()
 {
-#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);
+  checked_free(window_title_string);
+
+#if defined(TARGET_SDL2)
 
+#ifdef DEBUG
+  window_title_string = checked_malloc(strlen(getProgramInitString()) + 20 +
+				       strlen(getSourceDateString()) + 2 + 1);
+
+  if (setup.internal.show_scaling_in_title)
+    sprintf(window_title_string, "%s (%d %%) [%s]",
+	    getProgramInitString(), video.window_scaling_percent,
+	    getSourceDateString());
+  else
     sprintf(window_title_string, "%s [%s]",
-	    getProgramInitString(), getCompileDateString());
-  }
+	    getProgramInitString(),
+	    getSourceDateString());
+#else
+  window_title_string = checked_malloc(strlen(getProgramInitString()) + 20);
+
+  if (setup.internal.show_scaling_in_title)
+    sprintf(window_title_string, "%s (%d %%)",
+	    getProgramInitString(), video.window_scaling_percent);
+  else
+    sprintf(window_title_string, "%s",
+	    getProgramInitString());
+#endif
 
-  return window_title_string;
 #else
-  return getProgramInitString();
+
+#ifdef DEBUG
+  window_title_string = checked_malloc(strlen(getProgramInitString()) + 1 +
+				       strlen(getSourceDateString()) + 2 + 1);
+
+  sprintf(window_title_string, "%s [%s]",
+	  getProgramInitString(), getSourceDateString());
+#else
+  window_title_string = checked_malloc(strlen(getProgramInitString()) + 1);
+
+  sprintf(window_title_string, "%s",
+	  getProgramInitString());
 #endif
+
+#endif
+
+  return window_title_string;
 }