From dd71a05e3630d1225dfdf7cb22040899b903254e Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Sun, 2 Apr 2023 22:51:49 +0100
Subject: [PATCH] Put version at the bottom of the main menu

---
 .../Android/jni/OpenJK/code/qcommon/common.cpp  |  2 +-
 .../jni/OpenJK/code/qcommon/stv_version.h       |  6 ++++--
 z_vr_assets_jko/ui/main.menu                    | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Projects/Android/jni/OpenJK/code/qcommon/common.cpp b/Projects/Android/jni/OpenJK/code/qcommon/common.cpp
index 957d695..6f8c142 100644
--- a/Projects/Android/jni/OpenJK/code/qcommon/common.cpp
+++ b/Projects/Android/jni/OpenJK/code/qcommon/common.cpp
@@ -1134,7 +1134,7 @@ void Com_Init( char *commandLine ) {
 			Cmd_AddCommand ("freeze", Com_Freeze_f);
 		}
 
-		s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, SOURCE_DATE );
+		s = va("%s   %s", Q3_VERSION, SOURCE_DATE );
 		com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO );
 
 #ifdef JK2_MODE
diff --git a/Projects/Android/jni/OpenJK/code/qcommon/stv_version.h b/Projects/Android/jni/OpenJK/code/qcommon/stv_version.h
index be9f98c..efe6c90 100644
--- a/Projects/Android/jni/OpenJK/code/qcommon/stv_version.h
+++ b/Projects/Android/jni/OpenJK/code/qcommon/stv_version.h
@@ -23,10 +23,12 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 // Current version of the single player game
 #include "../win32/AutoVersion.h"
 
+#define JKXR_VERSION		"0.8.0"
+
 #ifdef _DEBUG
-	#define	Q3_VERSION		"(debug)OpenJK: v" VERSION_STRING_DOTTED
+	#define	Q3_VERSION		"(debug)OpenJK: v" VERSION_STRING_DOTTED "  JKXR: " JKXR_VERSION
 #elif defined FINAL_BUILD
-	#define	Q3_VERSION		"OpenJK: v" VERSION_STRING_DOTTED
+	#define	Q3_VERSION		"OpenJK: v" VERSION_STRING_DOTTED "  JKXR: " JKXR_VERSION
 #else
 	#define	Q3_VERSION		"(internal)OpenJK: v" VERSION_STRING_DOTTED
 #endif
diff --git a/z_vr_assets_jko/ui/main.menu b/z_vr_assets_jko/ui/main.menu
index e56e8a1..8dc1546 100644
--- a/z_vr_assets_jko/ui/main.menu
+++ b/z_vr_assets_jko/ui/main.menu
@@ -779,6 +779,23 @@
 			}
 		}
 
+		itemDef 
+		{
+			name				about
+			rect				105 461 500 24
+			type				0
+			cvar				"version"
+			textalign			ITEM_ALIGN_LEFT		
+			textalignx			150
+			textaligny			2
+			textalign			1    
+			font				2
+			textscale			.5
+			forecolor			1 1 1 1
+			visible				1
+			decoration
+		}
+
 	}
 }