version number set to 4.0.0.0 RC1

[rocksndiamonds.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index 955c4979f54ad64703d38f033a3e93bdfe9ad399..2e90887055567ac070a36b5527d6ca98697dc473 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -20,13 +20,18 @@ char *getCompileDateString()
   return COMPILE_DATE_STRING;
 }
 
+char *getProgramTitleString()
+{
+  return program.program_title;
+}
+
 char *getProgramVersionString()
 {
   static char program_version_string[32];
 
-  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);
+         PROGRAM_VERSION_BUILD, PROGRAM_VERSION_EXTRA);
 
   return program_version_string;
 }
@@ -37,11 +42,11 @@ char *getProgramInitString()
 
   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());
+           getProgramTitleString(), getProgramVersionString());
   }
 
   return program_init_string;
@@ -53,6 +58,8 @@ char *getWindowTitleString()
 
   checked_free(window_title_string);
 
+#if defined(TARGET_SDL2)
+
 #ifdef DEBUG
   window_title_string = checked_malloc(strlen(getProgramInitString()) + 20 +
                                       strlen(getCompileDateString()) + 2 + 1);
@@ -65,6 +72,23 @@ char *getWindowTitleString()
 
   sprintf(window_title_string, "%s (%d %%)",
          getProgramInitString(), setup.window_scaling_percent);
+#endif
+
+#else
+
+#ifdef DEBUG
+  window_title_string = checked_malloc(strlen(getProgramInitString()) + 1 +
+                                      strlen(getCompileDateString()) + 2 + 1);
+
+  sprintf(window_title_string, "%s [%s]",
+         getProgramInitString(), getCompileDateString());
+#else
+  window_title_string = checked_malloc(strlen(getProgramInitString()) + 1);
+
+  sprintf(window_title_string, "%s",
+         getProgramInitString());
+#endif
+
 #endif
 
   return window_title_string;