hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use item anims if in vehicle

Browse Source
This commit is contained in:
Vortrex
2022-07-26 02:16:17 -05:00
parent 13cf75262a
commit 6970d40f42
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/server/item.js
View File

@@ -480,7 +480,7 @@ function useItemCommand(command, params, client) {
return false; return false;
} }
if (getItemTypeData(getItemData(itemId).itemTypeIndex).useAnimationIndex != false) { if (getItemTypeData(getItemData(itemId).itemTypeIndex).useAnimationIndex != false && !isPlayerInAnyVehicle(client)) {
forcePlayerPlayAnimation(client, getItemTypeData(getItemData(itemId).itemTypeIndex).useAnimationIndex, 0.0); forcePlayerPlayAnimation(client, getItemTypeData(getItemData(itemId).itemTypeIndex).useAnimationIndex, 0.0);
} }
@@ -573,7 +573,7 @@ function pickupItemCommand(command, params, client) {
return false; return false;
} }
if (getItemTypeData(getItemData(itemId).itemTypeIndex).dropAnimationIndex != false) { if (getItemTypeData(getItemData(itemId).itemTypeIndex).dropAnimationIndex != false && !isPlayerInAnyVehicle(client)) {
forcePlayerPlayAnimation(client, getItemTypeData(getItemData(itemId).itemTypeIndex).pickupAnimationIndex, 0.0); forcePlayerPlayAnimation(client, getItemTypeData(getItemData(itemId).itemTypeIndex).pickupAnimationIndex, 0.0);
} }
@@ -643,7 +643,7 @@ function dropItemCommand(command, params, client) {
return false; return false;
} }
if (getItemTypeData(getItemData(itemId).itemTypeIndex).dropAnimationIndex != false) { if (getItemTypeData(getItemData(itemId).itemTypeIndex).dropAnimationIndex != false && !isPlayerInAnyVehicle(client)) {
forcePlayerPlayAnimation(client, getItemTypeData(getItemData(itemId).itemTypeIndex).dropAnimationIndex, 0.0); forcePlayerPlayAnimation(client, getItemTypeData(getItemData(itemId).itemTypeIndex).dropAnimationIndex, 0.0);
} }
@@ -709,7 +709,7 @@ function putItemCommand(command, params, client) {
return false; return false;
} }
if (getItemTypeData(getItemData(itemId).itemTypeIndex).putAnimationIndex != false) { if (getItemTypeData(getItemData(itemId).itemTypeIndex).putAnimationIndex != false && !isPlayerInAnyVehicle(client)) {
forcePlayerPlayAnimation(client, getItemTypeData(getItemData(itemId).itemTypeIndex).putAnimationIndex, 0.0); forcePlayerPlayAnimation(client, getItemTypeData(getItemData(itemId).itemTypeIndex).putAnimationIndex, 0.0);
} }
@@ -765,7 +765,7 @@ function takeItemCommand(command, params, client) {
// return false; // return false;
//} //}
if (getItemTypeData(getItemData(itemId).itemTypeIndex).takeAnimationIndex != false) { if (getItemTypeData(getItemData(itemId).itemTypeIndex).takeAnimationIndex != false && !isPlayerInAnyVehicle(client)) {
forcePlayerPlayAnimation(client, getItemTypeData(getItemData(itemId).itemTypeIndex).takeAnimationIndex, 0.0); forcePlayerPlayAnimation(client, getItemTypeData(getItemData(itemId).itemTypeIndex).takeAnimationIndex, 0.0);
} }
@@ -2841,42 +2841,42 @@ function clearPlayerItemActionState(client) {
if (getPlayerData(client).itemActionItem != -1) { if (getPlayerData(client).itemActionItem != -1) {
switch (getPlayerData(client).itemActionState) { switch (getPlayerData(client).itemActionState) {
case AGRP_ITEM_ACTION_DROP: { case AGRP_ITEM_ACTION_DROP: {
if (getItemTypeData(getItemData(getPlayerData(client).itemActionItem).itemTypeIndex).dropAnimationIndex != -1) { if (getItemTypeData(getItemData(getPlayerData(client).itemActionItem).itemTypeIndex).dropAnimationIndex != -1 && !isPlayerInAnyVehicle(client)) {
makePlayerStopAnimation(client); makePlayerStopAnimation(client);
} }
break; break;
} }
case AGRP_ITEM_ACTION_USE: { case AGRP_ITEM_ACTION_USE: {
if (getItemTypeData(getItemData(getPlayerData(client).itemActionItem).itemTypeIndex).useAnimationIndex != -1) { if (getItemTypeData(getItemData(getPlayerData(client).itemActionItem).itemTypeIndex).useAnimationIndex != -1 && !isPlayerInAnyVehicle(client)) {
makePlayerStopAnimation(client); makePlayerStopAnimation(client);
} }
break; break;
} }
case AGRP_ITEM_ACTION_PICKUP: { case AGRP_ITEM_ACTION_PICKUP: {
if (getItemTypeData(getItemData(getPlayerData(client).itemActionItem).itemTypeIndex).pickupAnimationIndex != -1) { if (getItemTypeData(getItemData(getPlayerData(client).itemActionItem).itemTypeIndex).pickupAnimationIndex != -1 && !isPlayerInAnyVehicle(client)) {
makePlayerStopAnimation(client); makePlayerStopAnimation(client);
} }
break; break;
} }
case AGRP_ITEM_ACTION_TAKE: { case AGRP_ITEM_ACTION_TAKE: {
if (getItemTypeData(getItemData(getPlayerData(client).itemActionItem).itemTypeIndex).takeAnimationIndex != -1) { if (getItemTypeData(getItemData(getPlayerData(client).itemActionItem).itemTypeIndex).takeAnimationIndex != -1 && !isPlayerInAnyVehicle(client)) {
makePlayerStopAnimation(client); makePlayerStopAnimation(client);
} }
break; break;
} }
case AGRP_ITEM_ACTION_PUT: { case AGRP_ITEM_ACTION_PUT: {
if (getItemTypeData(getItemData(getPlayerData(client).itemActionItem).itemTypeIndex).putAnimationIndex != -1) { if (getItemTypeData(getItemData(getPlayerData(client).itemActionItem).itemTypeIndex).putAnimationIndex != -1 && !isPlayerInAnyVehicle(client)) {
makePlayerStopAnimation(client); makePlayerStopAnimation(client);
} }
break; break;
} }
case AGRP_ITEM_ACTION_SWITCH: { case AGRP_ITEM_ACTION_SWITCH: {
if (getItemTypeData(getItemData(getPlayerData(client).itemActionItem).itemTypeIndex).switchAnimationIndex != -1) { if (getItemTypeData(getItemData(getPlayerData(client).itemActionItem).itemTypeIndex).switchAnimationIndex != -1 && !isPlayerInAnyVehicle(client)) {
makePlayerStopAnimation(client); makePlayerStopAnimation(client);
} }
break; break;