From b6d7ac69c37c71e987b4775282cd1c8e468cc81b Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Sun, 23 Oct 2016 21:03:02 -0400 Subject: [PATCH] set proper version string on mainhall for FS1 demo --- src/freespace2/freespace.cpp | 7 ++++++- src/menuui/mainhallmenu.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/freespace2/freespace.cpp b/src/freespace2/freespace.cpp index d66831d..4f0360b 100644 --- a/src/freespace2/freespace.cpp +++ b/src/freespace2/freespace.cpp @@ -7418,13 +7418,18 @@ void game_format_time(fix m_time, char *time_str, const int time_str_len) void get_version_string(char *str, const int str_len) { //XSTR:OFF +#ifdef FS1_DEMO + SDL_snprintf(str, str_len, "Dv%d.%02d", FS_VERSION_MAJOR, FS_VERSION_MINOR); + return; +#endif + if ( FS_VERSION_BUILD == 0 ) { SDL_snprintf(str, str_len, "v%d.%02d", FS_VERSION_MAJOR, FS_VERSION_MINOR); } else { SDL_snprintf(str, str_len, "v%d.%02d.%02d", FS_VERSION_MAJOR, FS_VERSION_MINOR, FS_VERSION_BUILD ); } -#if defined (FS2_DEMO) || defined(FS1_DEMO) +#if defined (FS2_DEMO) SDL_strlcat(str, " D", str_len); #elif defined (OEM_BUILD) SDL_strlcat(str, " (OEM)", str_len); diff --git a/src/menuui/mainhallmenu.cpp b/src/menuui/mainhallmenu.cpp index 9e082ac..71c6d5d 100644 --- a/src/menuui/mainhallmenu.cpp +++ b/src/menuui/mainhallmenu.cpp @@ -1915,7 +1915,7 @@ void main_hall_blit_version() // format the version string get_version_string(version_string, SDL_arraysize(version_string)); -#ifdef MAKE_FS1 +#if defined(MAKE_FS1) && !defined(FS1_DEMO) // tack on "EAX", since we have that :) SDL_strlcat(version_string, " EAX", sizeof(version_string)); #endif -- 2.39.2