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 e438abb..a9f822e 100644 Binary files a/assets/z_vr_assets.pk3 and b/assets/z_vr_assets.pk3 differ 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";