teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2025-05-31 09:00:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Proper handling of saber lock scenario

Browse source 
and small changes to MuadDib's persistent saber marks change
This commit is contained in:
Simon 2022-11-11 19:48:01 +00:00
parent 35e5cc428c
commit 15d1fef9b4
7 changed files with 106 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Projects/Android/jni/OpenJK/code/game/bg_pangles.cpp
View file

@ -716,6 +716,9 @@ qboolean PM_AdjustAnglesForBackAttack( gentity_t *ent, usercmd_t *ucmd )
qboolean PM_AdjustAnglesForSaberLock( gentity_t *ent, usercmd_t *ucmd )
{
//Don't do this in VR!
return qfalse;
if ( ent->client->ps.saberLockTime > level.time )
{
if ( ent->client->ps.viewEntity <= 0 || ent->client->ps.viewEntity >= ENTITYNUM_WORLD )
@ -790,6 +793,8 @@ qboolean PM_AdjustAnglesForKnockdown( gentity_t *ent, usercmd_t *ucmd, qboolean
ucmd->buttons = 0;
}
}
//Don't do this in VR!
/*
if ( !PM_InForceGetUp( &ent->client->ps ) )
{//can't turn unless in a force getup
if ( ent->client->ps.viewEntity <= 0 || ent->client->ps.viewEntity >= ENTITYNUM_WORLD )
@ -800,6 +805,7 @@ qboolean PM_AdjustAnglesForKnockdown( gentity_t *ent, usercmd_t *ucmd, qboolean
ucmd->angles[YAW] = ANGLE2SHORT( ent->client->ps.viewangles[YAW] ) - ent->client->ps.delta_angles[YAW];
return qtrue;
}
*/
}
return qfalse;
}