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

Ensure roll is used when in scope

Browse source
This commit is contained in:
Simon 2023-07-10 23:36:51 +01:00
parent bda2e7e3f1
commit d98a7aad7f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp
View file

@ -2259,7 +2259,7 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView ) {
//Sniper/E11 scope //Sniper/E11 scope
if (usingScope) if (usingScope)
{ {
cg.refdef.viewangles[ROLL] = vr->clientviewangles[ROLL]; cg.refdef.viewangles[ROLL] = vr->hmdorientation[ROLL];
cg.refdef.viewangles[PITCH] = vr->weaponangles[ANGLES_ADJUSTED][PITCH]; cg.refdef.viewangles[PITCH] = vr->weaponangles[ANGLES_ADJUSTED][PITCH];
cg.refdef.viewangles[YAW] = vr->clientviewangles[YAW] cg.refdef.viewangles[YAW] = vr->clientviewangles[YAW]
+ vr->weaponangles[ANGLES_ADJUSTED][YAW] + SHORT2ANGLE(cg.snap->ps.delta_angles[YAW]); + vr->weaponangles[ANGLES_ADJUSTED][YAW] + SHORT2ANGLE(cg.snap->ps.delta_angles[YAW]);

2
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp
View file

@ -3036,7 +3036,7 @@ void CG_DrawActive( stereoFrame_t stereoView ) {
//Sniper/E11 scope //Sniper/E11 scope
if (usingScope) if (usingScope)
{ {
cg.refdef.viewangles[ROLL] = vr->clientviewangles[ROLL]; cg.refdef.viewangles[ROLL] = vr->hmdorientation[ROLL];
cg.refdef.viewangles[PITCH] = vr->weaponangles[ANGLES_ADJUSTED][PITCH]; cg.refdef.viewangles[PITCH] = vr->weaponangles[ANGLES_ADJUSTED][PITCH];
cg.refdef.viewangles[YAW] = vr->clientviewangles[YAW] cg.refdef.viewangles[YAW] = vr->clientviewangles[YAW]
+ vr->weaponangles[ANGLES_ADJUSTED][YAW] + SHORT2ANGLE(cg.snap->ps.delta_angles[YAW]); + vr->weaponangles[ANGLES_ADJUSTED][YAW] + SHORT2ANGLE(cg.snap->ps.delta_angles[YAW]);