Don't freeze player on non-moving anims

This commit is contained in:
Vortrex
2021-11-25 04:15:42 -06:00
parent 683fa5908d
commit 520a169a42

View File

@@ -948,27 +948,35 @@ function sendPlayerEnterPropertyKey(client, key) {
function makePedPlayAnimation(ped, animationSlot, positionOffset) { function makePedPlayAnimation(ped, animationSlot, positionOffset) {
let animationData = getAnimationData(animationSlot); let animationData = getAnimationData(animationSlot);
if(animationData[9] != VRR_ANIMMOVE_NONE) { let freezePlayer = false;
setElementCollisionsEnabled(ped, false); //if(animationData[9] != VRR_ANIMMOVE_NONE) {
switch(animationData[9]) { switch(animationData[9]) {
case VRR_ANIMMOVE_FORWARD: case VRR_ANIMMOVE_FORWARD:
setElementCollisionsEnabled(ped, false);
setElementPosition(ped, getPosInFrontOfPos(getElementPosition(ped), fixAngle(getElementHeading(ped)), positionOffset)); setElementPosition(ped, getPosInFrontOfPos(getElementPosition(ped), fixAngle(getElementHeading(ped)), positionOffset));
freezePlayer = true;
break; break;
case VRR_ANIMMOVE_BACK: case VRR_ANIMMOVE_BACK:
setElementCollisionsEnabled(ped, false);
setElementPosition(ped, getPosBehindPos(getElementPosition(ped), fixAngle(getElementHeading(ped)), positionOffset)); setElementPosition(ped, getPosBehindPos(getElementPosition(ped), fixAngle(getElementHeading(ped)), positionOffset));
freezePlayer = true;
break; break;
case VRR_ANIMMOVE_LEFT: case VRR_ANIMMOVE_LEFT:
setElementCollisionsEnabled(ped, false);
setElementPosition(ped, getPosToLeftOfPos(getElementPosition(ped), fixAngle(getElementHeading(ped)), positionOffset)); setElementPosition(ped, getPosToLeftOfPos(getElementPosition(ped), fixAngle(getElementHeading(ped)), positionOffset));
freezePlayer = true;
break; break;
case VRR_ANIMMOVE_RIGHT: case VRR_ANIMMOVE_RIGHT:
setElementCollisionsEnabled(ped, false);
setElementPosition(ped, getPosToRightOfPos(getElementPosition(ped), fixAngle(getElementHeading(ped)), positionOffset)); setElementPosition(ped, getPosToRightOfPos(getElementPosition(ped), fixAngle(getElementHeading(ped)), positionOffset));
freezePlayer = true;
break; break;
} }
} //}
triggerNetworkEvent("vrr.pedAnim", null, ped.id, animationData[1], animationData[2], animationData[3], animationData[4], animationData[5], positionOffset); triggerNetworkEvent("vrr.pedAnim", null, ped.id, animationData[1], animationData[2], animationData[3], animationData[4], animationData[5], positionOffset, freezePlayer);
} }
// =========================================================================== // ===========================================================================