diff --git a/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp b/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp index 978f714..f056189 100644 --- a/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp +++ b/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp @@ -552,7 +552,7 @@ void VR_HapticEvent(const char* event, int position, int flags, int intensity, f } } - TBXR_Vibrate(200, weaponFireChannel, fIntensity); + TBXR_Vibrate(300, weaponFireChannel, fIntensity); } else if (strcmp(event, "RTCWQuest:fire_tesla") == 0) // Weapon power build up { diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp index 89a240f..6c3d2fe 100644 --- a/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp +++ b/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp @@ -6496,6 +6496,11 @@ Ghoul2 Insert End { if ( !noMarks ) { + int position = (vr->right_handed ? + ((saberNum == 0) ? 2 : 1) : + ((saberNum == 0) ? 1 : 2)); + cgi_HapticEvent("chainsaw_fire", position, 0, 25, 0, 0); + /* if ( !(cent->gent->client->ps.saberEventFlags&SEF_INWATER) ) { @@ -6521,6 +6526,11 @@ Ghoul2 Insert End { if ( !noMarks ) { + int position = (vr->right_handed ? + ((saberNum == 0) ? 2 : 1) : + ((saberNum == 0) ? 1 : 2)); + cgi_HapticEvent("chainsaw_fire", position, 0, 25, 0, 0); + if ( ( !WP_SaberBladeUseSecondBladeStyle( &client->ps.saber[saberNum], bladeNum ) && !(client->ps.saber[saberNum].saberFlags2&SFL2_NO_WALL_MARKS) ) || ( WP_SaberBladeUseSecondBladeStyle( &client->ps.saber[saberNum], bladeNum ) && !(client->ps.saber[saberNum].saberFlags2&SFL2_NO_WALL_MARKS2) ) ) {