teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-21 19:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes to ea build

Browse source
This commit is contained in:
Simon 2022-10-15 00:26:21 +01:00
parent 086949eedd
commit fdb7b6d217
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
View file

@ -2898,7 +2898,6 @@ void CG_DrawItemSelector( void )
break; break;
} }
#ifdef _DEMO
if (itemId == WP_SABER || if (itemId == WP_SABER ||
itemId == WP_BRYAR_PISTOL || itemId == WP_BRYAR_PISTOL ||
itemId == WP_BLASTER || itemId == WP_BLASTER ||
@ -2909,9 +2908,6 @@ void CG_DrawItemSelector( void )
} else { } else {
continue; continue;
} }
#else
CG_RegisterWeapon(itemId);
#endif
} }
{ {

BIN
assets/z_vr_assets.pk3
View file

Binary file not shown.

4
java/com/drbeef/jkquest/GLES3JNIActivity.java
View file

@ -171,7 +171,7 @@ import static android.system.Os.setenv;
for (File child : new File("/sdcard/JKQuest/Demo/base").listFiles()) { for (File child : new File("/sdcard/JKQuest/Demo/base").listFiles()) {
if (child.isFile() && if (child.isFile() &&
child.getName().contains("pk3") && 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(); child.delete();
} }
@ -190,7 +190,7 @@ import static android.system.Os.setenv;
copy_asset("/sdcard/JKQuest/Demo/base", "z_bryar_ashura.pk3", false); copy_asset("/sdcard/JKQuest/Demo/base", "z_bryar_ashura.pk3", false);
//Our assets //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"; commandLineParams = "jo";