teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-24 13:01:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

haptic feedback when saber is burning scorch marks or boiling water

Browse source
This commit is contained in:
Simon 2023-04-26 21:18:56 +01:00
parent 86b974ea2e
commit 0674c3080f
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp
View file

@ -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 else if (strcmp(event, "RTCWQuest:fire_tesla") == 0) // Weapon power build up
{ {

10
Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp
View file

@ -6496,6 +6496,11 @@ Ghoul2 Insert End
{ {
if ( !noMarks ) 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) ) if ( !(cent->gent->client->ps.saberEventFlags&SEF_INWATER) )
{ {
@ -6521,6 +6526,11 @@ Ghoul2 Insert End
{ {
if ( !noMarks ) 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) ) 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) ) ) || ( WP_SaberBladeUseSecondBladeStyle( &client->ps.saber[saberNum], bladeNum ) && !(client->ps.saber[saberNum].saberFlags2&SFL2_NO_WALL_MARKS2) ) )
{ {