diff --git a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/zscript/actors/inventory/weapons.zs b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/zscript/actors/inventory/weapons.zs index de7a024..4832b9d 100644 --- a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/zscript/actors/inventory/weapons.zs +++ b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/zscript/actors/inventory/weapons.zs @@ -415,20 +415,24 @@ class Weapon : StateProvider action void A_ZoomFactor(double zoom = 1, int flags = 0) { - let player = self.player; - if (player != NULL && player.ReadyWeapon != NULL) - { - zoom = 1 / clamp(zoom, 0.1, 50.0); - if (flags & 1) - { // Make the zoom instant. - player.FOV = player.DesiredFOV * zoom; - } - if (flags & 2) - { // Disable pitch/yaw scaling. - zoom = -zoom; - } - player.ReadyWeapon.FOVScale = zoom; - } + CVar recoil = CVar.FindCVar('vr_recoil'); + if (recoil.GetBool()) + { + let player = self.player; + if (player != NULL && player.ReadyWeapon != NULL) + { + zoom = 1 / clamp(zoom, 0.1, 50.0); + if (flags & 1) + { // Make the zoom instant. + player.FOV = player.DesiredFOV * zoom; + } + if (flags & 2) + { // Disable pitch/yaw scaling. + zoom = -zoom; + } + player.ReadyWeapon.FOVScale = zoom; + } + } } //=========================================================================== diff --git a/assets/mods/laser-sight-0.5.5-vr.pk3 b/assets/mods/laser-sight-0.5.5-vr.pk3 new file mode 100644 index 0000000..6e47129 Binary files /dev/null and b/assets/mods/laser-sight-0.5.5-vr.pk3 differ diff --git a/assets/res/lzdoom.pk3 b/assets/res/lzdoom.pk3 index aa38775..c458416 100644 Binary files a/assets/res/lzdoom.pk3 and b/assets/res/lzdoom.pk3 differ diff --git a/java/com/drbeef/questzdoom/GLES3JNIActivity.java b/java/com/drbeef/questzdoom/GLES3JNIActivity.java index 523c147..541e898 100644 --- a/java/com/drbeef/questzdoom/GLES3JNIActivity.java +++ b/java/com/drbeef/questzdoom/GLES3JNIActivity.java @@ -164,6 +164,7 @@ import android.support.v4.content.ContextCompat; copy_asset("/sdcard/QuestZDoom", "res/lz_game_support.pk3", true); copy_asset("/sdcard/QuestZDoom", "res/lights.pk3", true); copy_asset("/sdcard/QuestZDoom", "res/brightmaps.pk3", true); + copy_asset("/sdcard/QuestZDoom", "mods/laser-sight-0.5.5-vr.pk3", false); copy_asset("/sdcard/QuestZDoom/audiopack", "snd_fluidsynth/fluidsynth.sf2", false); //Doom Sharware WAD