version number set to 4.1.2.0

[rocksndiamonds.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index fe40a69769a255ebb20c146f78c67193887fd6df..8c4f1b5a8602e10069126e582d721b170f419b8a 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -15,33 +15,33 @@
 #include "conftime.h"
 
 
-char *getSourceDateString()
+char *getSourceDateString(void)
 {
   return SOURCE_DATE_STRING;
 }
 
-char *getProgramTitleString()
+char *getProgramTitleString(void)
 {
   return program.program_title;
 }
 
-char *getProgramRealVersionString()
+char *getProgramRealVersionString(void)
 {
   static char program_version_string[32];
 
   sprintf(program_version_string, "%d.%d.%d.%d%s",
-         PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH,
-         PROGRAM_VERSION_BUILD, PROGRAM_VERSION_EXTRA);
+         PROGRAM_VERSION_SUPER, PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR,
+         PROGRAM_VERSION_PATCH, PROGRAM_VERSION_EXTRA);
 
   return program_version_string;
 }
 
-char *getProgramVersionString()
+char *getProgramVersionString(void)
 {
   return program.version_string;
 }
 
-char *getProgramInitString()
+char *getProgramInitString(void)
 {
   static char *program_init_string = NULL;
 
@@ -57,7 +57,7 @@ char *getProgramInitString()
   return program_init_string;
 }
 
-char *getConfigProgramTitleString()
+char *getConfigProgramTitleString(void)
 {
   TreeInfo *graphics_current =
     getArtworkTreeInfoForUserLevelSet(ARTWORK_TYPE_GRAPHICS);
@@ -69,7 +69,7 @@ char *getConfigProgramTitleString()
          setup.internal.program_title);
 }
 
-char *getConfigProgramCopyrightString()
+char *getConfigProgramCopyrightString(void)
 {
   TreeInfo *graphics_current =
     getArtworkTreeInfoForUserLevelSet(ARTWORK_TYPE_GRAPHICS);
@@ -81,7 +81,7 @@ char *getConfigProgramCopyrightString()
          setup.internal.program_copyright);
 }
 
-char *getConfigProgramCompanyString()
+char *getConfigProgramCompanyString(void)
 {
   TreeInfo *graphics_current =
     getArtworkTreeInfoForUserLevelSet(ARTWORK_TYPE_GRAPHICS);
@@ -93,14 +93,12 @@ char *getConfigProgramCompanyString()
          setup.internal.program_company);
 }
 
-char *getWindowTitleString()
+char *getWindowTitleString(void)
 {
   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(getSourceDateString()) + 2 + 1);
@@ -122,23 +120,6 @@ char *getWindowTitleString()
   else
     sprintf(window_title_string, "%s",
            getProgramInitString());
-#endif
-
-#else
-
-#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;