diff --git a/.gitmodules b/.gitmodules index 311813a..f536e68 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,3 +5,10 @@ [submodule "Projects/Android/jni/src/hlsdk-xash3d-opfor"] path = Projects/Android/jni/src/hlsdk-xash3d-opfor url = https://github.com/DrBeef/hlsdk-xash3d-opfor + +[submodule "Projects/Android/jni/src/hlsdk-xash3d_aomdc"] + path = Projects/Android/jni/src/hlsdk-xash3d_aomdc + url = https://github.com/kote2345/hlsdk-xash3d_aomdc +[submodule "Projects/Android/jni/src/hlsdk-xash3d_theyhunger"] + path = Projects/Android/jni/src/hlsdk-xash3d_theyhunger + url = https://github.com/kote2345/hlsdk-xash3d_theyhunger diff --git a/Projects/Android/jni/Application.mk b/Projects/Android/jni/Application.mk index 51f5f11..8e03e58 100644 --- a/Projects/Android/jni/Application.mk +++ b/Projects/Android/jni/Application.mk @@ -30,7 +30,7 @@ HLSDK_PATH := $(APPLICATIONMK_PATH)/src/HLSDK/halflife/ # step will error as we currently remove prebuilt artifacts on clean. APP_ALLOW_MISSING_DEPS=true -APP_MODULES := gl4es xash menu client server client_opfor server_opfor +APP_MODULES := gl4es xash menu client server client_opfor server_opfor client_aomdc server_aomdc client_theyhunger server_theyhunger APP_STL := c++_shared diff --git a/Projects/Android/jni/src/hlsdk-xash3d_aomdc b/Projects/Android/jni/src/hlsdk-xash3d_aomdc new file mode 160000 index 0000000..64b4f7c --- /dev/null +++ b/Projects/Android/jni/src/hlsdk-xash3d_aomdc @@ -0,0 +1 @@ +Subproject commit 64b4f7c46d0d476828fe12e93e9be23436c92b12 diff --git a/Projects/Android/jni/src/hlsdk-xash3d_theyhunger b/Projects/Android/jni/src/hlsdk-xash3d_theyhunger new file mode 160000 index 0000000..beaa8bd --- /dev/null +++ b/Projects/Android/jni/src/hlsdk-xash3d_theyhunger @@ -0,0 +1 @@ +Subproject commit beaa8bdaf3414968343c5273acf607cc32f92f14 diff --git a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java index 5504590..d4f87ae 100644 --- a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java +++ b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java @@ -194,7 +194,7 @@ import static android.system.Os.setenv; copy_asset("/sdcard/xash/valve/", "sprites/pointer.tga", true); //Copy modified weapon models - This is the base set - if (!(new File("/sdcard/xash/" + game + "/models/no_copy").exists())) + if (!(new File("/sdcard/xash/" + game + "/models/no_copy").exists()) && !(game.equalsIgnoreCase("Hunger"))) { //Colt (A-16) copy_asset("/sdcard/xash/" + game + "/", "models/v_9mmar.mdl", true); @@ -418,6 +418,59 @@ import static android.system.Os.setenv; { copy_asset("/sdcard/xash/", "bshift/models/v_hand.mdl", true); } + + //Copy They Hunger specific models + if (game.equalsIgnoreCase("Hunger") && + !(new File("/sdcard/xash/" + game + "/models/no_copy").exists())) + { + //HL1 models + copy_asset("/sdcard/xash/" + game + "/", "/models/v_rpg.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_357.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_satchel.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_satchel_radio.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_tripmine.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_crossbow.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_gauss.mdl", true); + copy_asset("/sdcard/xash/" + game + "/", "/models/v_squeak.mdl", true); + + //They Hunger models + copy_asset("/sdcard/xash/", "Hunger/models/v_9mmar.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_9mmhandgun.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_ap9.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_egon.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_hkg36.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_shotgun.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_shovel.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_taurus.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_tfac.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_tfc_medkit.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_tfc_sniper.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_tfc_spanner.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_tnt.mdl", true); + copy_asset("/sdcard/xash/", "Hunger/models/v_hand.mdl", true); + } + + //Copy Afraid of Monsters Director's Cut specific models + if (game.equalsIgnoreCase("AoMDC") && + !(new File("/sdcard/xash/" + game + "/models/no_copy").exists())) + { + //Afraid of Monsters Director's Cut models + copy_asset("/sdcard/xash/", "AoMDC/models/v_axe.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_beretta.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_deagle.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_glock.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_hammer.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_hand.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_kitchenknife.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_mp5k.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_p228.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_revolver.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_shotgun.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_spear.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_torch.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/v_uzi.mdl", true); + copy_asset("/sdcard/xash/", "AoMDC/models/gmgeneral_display.aomdc", true); + } //Set default environment try { @@ -435,6 +488,14 @@ import static android.system.Os.setenv; //Use pipewrench as backpack weapon in opposing force setenv("VR_BACKPACK_WEAPON", "weapon_pipewrench", true); } + else if (game.equalsIgnoreCase("aomdc")) + { + setenv("XASH3D_LIBSUFFIX", "_aomdc", true); + } + else if (game.equalsIgnoreCase("hunger")) + { + setenv("XASH3D_LIBSUFFIX", "_theyhunger", true); + } else { setenv("XASH3D_LIBSUFFIX", "", true);