From 176d7efeade1b23ba4ecfa9ecdb76c5e954eeab4 Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Thu, 4 May 2023 19:53:52 +0100
Subject: [PATCH] Update version

and remove an assert that was causing an issue in debug with the dark forces mod
---
 Projects/Android/AndroidManifest.xml                   | 4 ++--
 Projects/Android/jni/OpenJK/code/client/snd_music.cpp  | 2 +-
 Projects/Android/jni/OpenJK/code/qcommon/stv_version.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index 8b0772c..c1fb200 100644
--- a/Projects/Android/AndroidManifest.xml
+++ b/Projects/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="com.drbeef.jkxr"
-		android:versionCode="56"
-		android:versionName="1.1.4" android:installLocation="auto" >
+		android:versionCode="57"
+		android:versionName="1.1.5" android:installLocation="auto" >
 
 	<!-- Tell the system this app requires OpenGL ES 3.1. -->
 	<uses-feature android:glEsVersion="0x00030002" android:required="true"/>
diff --git a/Projects/Android/jni/OpenJK/code/client/snd_music.cpp b/Projects/Android/jni/OpenJK/code/client/snd_music.cpp
index 8c8eec9..8f39e14 100644
--- a/Projects/Android/jni/OpenJK/code/client/snd_music.cpp
+++ b/Projects/Android/jni/OpenJK/code/client/snd_music.cpp
@@ -602,7 +602,7 @@ static qboolean Music_ParseLeveldata( gsl::czstring psLevelName )
 				{
 					// then this must be "action" music under current rules...
 					//
-					assert( !strcmp(psMusicStateType, Music_BaseStateToString(eBGRNDTRACK_ACTION) ? Music_BaseStateToString(eBGRNDTRACK_ACTION):"") );
+					//assert( !strcmp(psMusicStateType, Music_BaseStateToString(eBGRNDTRACK_ACTION) ? Music_BaseStateToString(eBGRNDTRACK_ACTION):"") );
 					//
 					// does this marker exist in the explore piece?
 					//
diff --git a/Projects/Android/jni/OpenJK/code/qcommon/stv_version.h b/Projects/Android/jni/OpenJK/code/qcommon/stv_version.h
index 94c6d55..34753c9 100644
--- a/Projects/Android/jni/OpenJK/code/qcommon/stv_version.h
+++ b/Projects/Android/jni/OpenJK/code/qcommon/stv_version.h
@@ -23,7 +23,7 @@ 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		"1.1.4-ea"
+#define JKXR_VERSION		"1.1.5-ea"
 
 #ifdef _DEBUG
 	#define	Q3_VERSION		"(debug)OpenJK: v" VERSION_STRING_DOTTED "  JKXR: " JKXR_VERSION