From 00baa9cd7a902e19ae8e71324359bca15f2dd03d Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 6 Mar 2021 20:28:51 +0000 Subject: [PATCH] Haptic feedback working with Meatgrinder mod --- Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_mobj.cpp | 2 +- java/com/drbeef/questzdoom/GLES3JNIActivity.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_mobj.cpp b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_mobj.cpp index 527e7d4..273f3e5 100644 --- a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_mobj.cpp +++ b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_mobj.cpp @@ -6842,7 +6842,7 @@ AActor *P_SpawnPlayerMissile (AActor *source, double x, double y, double z, if (P_CheckMissileSpawn (MissileActor, source->radius)) { //Could be the Brutal Doom flashlight! - if (MissileActor->DamageType.GetIndex() != 0) + if (MissileActor->DamageFunc != nullptr) { //Haptics long rightHanded = vr_control_scheme < 10; diff --git a/java/com/drbeef/questzdoom/GLES3JNIActivity.java b/java/com/drbeef/questzdoom/GLES3JNIActivity.java index e0bddb7..6666095 100644 --- a/java/com/drbeef/questzdoom/GLES3JNIActivity.java +++ b/java/com/drbeef/questzdoom/GLES3JNIActivity.java @@ -117,6 +117,7 @@ import android.support.v4.content.ContextCompat; } else { + finish(); System.exit(0); } } @@ -127,6 +128,7 @@ import android.support.v4.content.ContextCompat; } else { + finish(); System.exit(0); } }