mirror of
https://github.com/XProger/OpenLara.git
synced 2025-08-21 20:35:17 +02:00
Fix tracking of targets on right tangent and restoring Lara's (#392)
torso and head rotations once target has been lost
This commit is contained in:
@@ -2812,7 +2812,7 @@ struct Lara : ItemObj
|
|||||||
if (R.aim && L.aim) {
|
if (R.aim && L.aim) {
|
||||||
H.x = T.x = aX >> 2;
|
H.x = T.x = aX >> 2;
|
||||||
H.y = T.y = aY >> 2;
|
H.y = T.y = aY >> 2;
|
||||||
} else if (R.aim ^ L.aim) {
|
} else {
|
||||||
H.x = T.x = aX >> 1;
|
H.x = T.x = aX >> 1;
|
||||||
H.y = T.y = aY >> 1;
|
H.y = T.y = aY >> 1;
|
||||||
}
|
}
|
||||||
@@ -3636,7 +3636,7 @@ struct Lara : ItemObj
|
|||||||
extraL->armR.aim = extraL->armL.aim = true;
|
extraL->armR.aim = extraL->armL.aim = true;
|
||||||
} else {
|
} else {
|
||||||
extraL->armR.aim = extraL->armR.aim && (abs(angleAim.x) <= params.armX) && (angleAim.y >= params.armMinY) && (angleAim.y <= params.armMaxY);
|
extraL->armR.aim = extraL->armR.aim && (abs(angleAim.x) <= params.armX) && (angleAim.y >= params.armMinY) && (angleAim.y <= params.armMaxY);
|
||||||
extraL->armL.aim = extraL->armR.aim && (abs(angleAim.x) <= params.armX) && (angleAim.y >= -params.armMaxY) && (angleAim.y <= -params.armMinY);
|
extraL->armL.aim = extraL->armL.aim && (abs(angleAim.x) <= params.armX) && (angleAim.y >= -params.armMaxY) && (angleAim.y <= -params.armMinY);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
extraL->armR.aim = extraL->armL.aim = false;
|
extraL->armR.aim = extraL->armL.aim = false;
|
||||||
|
Reference in New Issue
Block a user