diff --git a/desktop_version/src/ReleaseVersion.h b/desktop_version/src/ReleaseVersion.h new file mode 100644 index 00000000..cd230c3a --- /dev/null +++ b/desktop_version/src/ReleaseVersion.h @@ -0,0 +1,6 @@ +#ifndef RELEASEVERSION_H +#define RELEASEVERSION_H + +#define RELEASE_VERSION "v2.4" + +#endif /* RELEASEVERSION_H */ diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp index bce5901b..b1c9e315 100644 --- a/desktop_version/src/Render.cpp +++ b/desktop_version/src/Render.cpp @@ -15,6 +15,7 @@ #include "Map.h" #include "Maths.h" #include "Music.h" +#include "ReleaseVersion.h" #include "Screen.h" #include "Script.h" #include "UtilityClass.h" @@ -148,7 +149,7 @@ static void menurender(void) graphics.Print( 310 - (10*8), 210, COMMIT_DATE, tr/2, tg/2, tb/2); graphics.Print( 310 - LEN_INTERIM_COMMIT * 8, 220, INTERIM_COMMIT, tr/2, tg/2, tb/2); #endif - graphics.Print( 310 - (4*8), 230, "v2.4", tr/2, tg/2, tb/2); + graphics.Print( 310 - (SDL_arraysize(RELEASE_VERSION) - 1) * 8, 230, RELEASE_VERSION, tr/2, tg/2, tb/2); if(music.mmmmmm){ graphics.Print( 10, 230, "[MMMMMM Mod Installed]", tr/2, tg/2, tb/2); diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp index 33988be3..41d02462 100644 --- a/desktop_version/src/main.cpp +++ b/desktop_version/src/main.cpp @@ -21,6 +21,7 @@ #include "Music.h" #include "Network.h" #include "preloader.h" +#include "ReleaseVersion.h" #include "Render.h" #include "RenderFixed.h" #include "Screen.h" @@ -387,9 +388,8 @@ int main(int argc, char *argv[]) if (ARG("-version")) { /* Just print the version and exit. No vlogging. */ - /* TODO: Version should be de-duplicated and only set in one place... TwT */ /* TODO: Also print commit date and hash, if applicable. */ - puts("VVVVVV v2.4"); + puts("VVVVVV " RELEASE_VERSION); VVV_exit(0); } else if (ARG("-renderer"))