fixed bug with restarting same menu music on different screens

[rocksndiamonds.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index da6d1a9613da12434bbf0f727ba29f52c22d3a7e..0eb51d2ec27db76cde56521cff216f2332db4379 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;
@@ -60,13 +65,13 @@ char *getWindowTitleString()
                                       strlen(getCompileDateString()) + 2 + 1);
 
   sprintf(window_title_string, "%s (%d %%) [%s]",
-         getProgramInitString(), setup.window_scaling_percent,
+         getProgramInitString(), video.window_scaling_percent,
          getCompileDateString());
 #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
 
 #else