From fdb7b6d2179c6b92edb712d78fdea030ba036f7a Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Sat, 15 Oct 2022 00:26:21 +0100
Subject: [PATCH] Fixes to ea build

---
 .../jni/OpenJK/codeJK2/cgame/cg_weapons.cpp   |   4 ----
 assets/z_vr_assets.pk3                        | Bin 1057834 -> 1057834 bytes
 java/com/drbeef/jkquest/GLES3JNIActivity.java |   4 ++--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
index e920217..f0a1d92 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
@@ -2898,7 +2898,6 @@ void CG_DrawItemSelector( void )
 				break;
 			}
 
-#ifdef _DEMO
 			if (itemId == WP_SABER ||
 				itemId == WP_BRYAR_PISTOL ||
 				itemId == WP_BLASTER ||
@@ -2909,9 +2908,6 @@ void CG_DrawItemSelector( void )
 			} else {
 				continue;
 			}
-#else
-            CG_RegisterWeapon(itemId);
-#endif
 		}
 
 		{
diff --git a/assets/z_vr_assets.pk3 b/assets/z_vr_assets.pk3
index e438abb65fb34550b7c7c5d7021b897dbbba53e9..a9f822e8c657694280b7c8b4fb40c82fa8fe6c28 100644
GIT binary patch
delta 293
zcmZ2=!eP}32i^d0W)=|!1_llW69)f{ytjp!f%N9r!n?Sc^?{5P^3j)>H!%25X8WuK
zl4&;nyxsUSqe(l6vpuVdNm(4snlO>c49sdjxq=CZnSq!Eh*^P{4T#x+m;;D8ftU-3
zxq+Amh<SmSZ~Ms={Q5c|`?mkS!XM5DW`#cH4}h>%eB@sx1`*>Bm?;6WZ~8|C0UI#G
zKvBRRBsaZCQNRV{(&;-D1+2hQ-xLMh!3+l_0WUD47sj}yB;WzorK&7o4Q3=O3pj!q
O%asM}z>F8l0!{$DG+dzo

delta 293
zcmZ2=!eP}32i^d0W)=|!1_lm>(_4Kv^4=C^UQp({`L*yaZszuRzMEIbM_*<ZTH`mF
z?Xwnh`YOL><ImfTKQo%NGpDTb+n!a$q%6*SuFr4#go#XM;>@pB`?a53!34z2K+FQf
ztU$~L#Oy%K0mPg@%mu{UK+FTgyg<yi{p1RMeI4eeZ9dz7U*QkuW9|a7LLc)7@G+-v
z_1V7SBmXKf=B=B7VjKc9C76K@o&Hflzy{>f=?01d_8^x|FH#h60l9SgPDKGLkW;6B
zQxtFqIdi&$l7JV;mD77c44@;Y-%=9r0NFQPRaw9qWZm>+WdTQ!ZPS-43)q1yoBl#s
GzzG0SBXidP

diff --git a/java/com/drbeef/jkquest/GLES3JNIActivity.java b/java/com/drbeef/jkquest/GLES3JNIActivity.java
index 4e66611..c1e6042 100644
--- a/java/com/drbeef/jkquest/GLES3JNIActivity.java
+++ b/java/com/drbeef/jkquest/GLES3JNIActivity.java
@@ -171,7 +171,7 @@ import static android.system.Os.setenv;
 		for (File child : new File("/sdcard/JKQuest/Demo/base").listFiles()) {
 			if (child.isFile() &&
 					child.getName().contains("pk3") &&
-					!child.getName().contains("z_npc_vr") // don't delete our npc mod as this might be tweaked
+					!child.getName().contains("z_vr_assets") // don't delete our npc mod as this might be tweaked
 			)
 				child.delete();
 		}
@@ -190,7 +190,7 @@ import static android.system.Os.setenv;
 		copy_asset("/sdcard/JKQuest/Demo/base", "z_bryar_ashura.pk3", false);
 
 		//Our assets
-		copy_asset("/sdcard/JKQuest/JK2/base", "z_vr_assets.pk3", true);
+		copy_asset("/sdcard/JKQuest/Demo/base", "z_vr_assets.pk3", true);
 
 		commandLineParams = "jo";