teambeef/rtcwquest
0
0
Fork 0
mirror of https://github.com/DrBeef/RTCWQuest.git synced 2025-04-22 23:11:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use proper angle for binoculars model; Do not draw second binoculars with akimbo

Browse source
This commit is contained in:
Petr Bartos 2023-10-14 16:07:50 +02:00
parent 804e26bc2b
commit 5367d94db4
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Projects/Android/jni/rtcw/src/cgame/cg_weapons.c
View file

@ -1980,14 +1980,18 @@ void CG_CalculateVRWeaponPosition( int weaponNum, vec3_t origin, vec3_t angles )
convertFromVR(cgVR->calculated_weaponoffset, cg.refdef.vieworg, origin);
origin[2] -= 64;
origin[2] += (cgVR->hmdposition[1] + cg_heightAdjust.value) * cg_worldScale.value;
switch (cg.predictedPlayerState.weapon)
{
case WP_KNIFE:
VectorCopy(cgVR->weaponangles_knife, angles);
break;
default:
VectorCopy(cgVR->weaponangles, angles);
break;
if (cgVR->backpackitemactive == 3 || cgVR->binocularsActive) {
VectorCopy(cgVR->dominanthandangles, angles);
} else {
switch (cg.predictedPlayerState.weapon)
{
case WP_KNIFE:
VectorCopy(cgVR->weaponangles_knife, angles);
break;
default:
VectorCopy(cgVR->weaponangles, angles);
break;
}
}
angles[YAW] += cg.refdefViewAngles[YAW] - cgVR->hmdorientation[YAW];
}
@ -3765,7 +3769,7 @@ void CG_AddViewWeapon( playerState_t *ps ) {
// add everything onto the hand
CG_AddPlayerWeapon(&hand, ps, &cg.predictedPlayerEntity, qfalse);
if (ps->weapon == WP_AKIMBO) {
if (ps->weapon == WP_AKIMBO && cgVR->backpackitemactive != 3 && !cgVR->binocularsActive) {
CG_AddPlayerWeapon(&handAkimbo, ps, &cg.predictedPlayerEntity, qtrue);
}
// Ridah