X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconfig.c;h=02083581813486a7a636c2fc1b397532434b7b91;hb=499ad3bb12d513266ddcebe41a84eee8237a7fb5;hp=da6d1a9613da12434bbf0f727ba29f52c22d3a7e;hpb=b40330e01f14051b3b15a7dac50e1568a9cf4455;p=rocksndiamonds.git

diff --git a/src/config.c b/src/config.c
index da6d1a96..02083581 100644
--- a/src/config.c
+++ b/src/config.c
@@ -15,33 +15,43 @@
 #include "conftime.h"
 
 
-char *getCompileDateString()
+char *getSourceDateString()
 {
-  return COMPILE_DATE_STRING;
+  return SOURCE_DATE_STRING;
 }
 
-char *getProgramVersionString()
+char *getProgramTitleString()
+{
+  return program.program_title;
+}
+
+char *getProgramRealVersionString()
 {
   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;
 }
 
+char *getProgramVersionString()
+{
+  return program.version_string;
+}
+
 char *getProgramInitString()
 {
   static char *program_init_string = NULL;
 
   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;
@@ -57,26 +67,26 @@ char *getWindowTitleString()
 
 #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
 
 #else
 
 #ifdef DEBUG
   window_title_string = checked_malloc(strlen(getProgramInitString()) + 1 +
-				       strlen(getCompileDateString()) + 2 + 1);
+				       strlen(getSourceDateString()) + 2 + 1);
 
   sprintf(window_title_string, "%s [%s]",
-	  getProgramInitString(), getCompileDateString());
+	  getProgramInitString(), getSourceDateString());
 #else
   window_title_string = checked_malloc(strlen(getProgramInitString()) + 1);