stop animation fixes while in vehicle

This commit is contained in:
vbawol
2013-06-20 08:46:19 -05:00
parent 5b0d2e0f5c
commit 1936d33a23
23 changed files with 96 additions and 48 deletions

View File

@@ -68,12 +68,12 @@ _cookedmeat = meatcooked;
} else { } else {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText [format["Canceled cooking %1",_textraw], "PLAIN DOWN"]; cutText [format["Canceled cooking %1",_textraw], "PLAIN DOWN"];
// player addMagazine "ItemBandage";
}; };
}; };
} forEach _rawmeat; } forEach _rawmeat;

View File

@@ -66,8 +66,11 @@ if(_IsNearVehicle >= 1) then {
if(!_finished) then { if(!_finished) then {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop"; if (vehicle player == player) then {
[objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
_abort = true; _abort = true;
}; };

View File

@@ -41,8 +41,10 @@ r_doLoop = false;
if(!_finished) then { if(!_finished) then {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled." , "PLAIN DOWN"] cutText ["Canceled." , "PLAIN DOWN"]
}; };

View File

@@ -49,8 +49,10 @@ if ((_hasKnife or _hasKnifeBlunt) and !_hasHarvested) then {
if (!_finished) exitWith { if (!_finished) exitWith {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled gutting." , "PLAIN DOWN"]; cutText ["Canceled gutting." , "PLAIN DOWN"];
//_abort = true; //_abort = true;
}; };

View File

@@ -50,8 +50,10 @@ if ((_hasKnife or _hasKnifeBlunt) and !_hasHarvested) then {
if (!_finished) exitWith { if (!_finished) exitWith {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled gutting." , "PLAIN DOWN"]; cutText ["Canceled gutting." , "PLAIN DOWN"];
//_abort = true; //_abort = true;
}; };

View File

@@ -55,8 +55,10 @@ for "_x" from 1 to _qty do {
if (!_finished) exitWith { if (!_finished) exitWith {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled siphon." , "PLAIN DOWN"]; cutText ["Canceled siphon." , "PLAIN DOWN"];
_abort = true; _abort = true;
}; };

View File

@@ -69,8 +69,10 @@ if(_finished) then {
}; };
} else { } else {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled Key Crafting." , "PLAIN DOWN"]; cutText ["Canceled Key Crafting." , "PLAIN DOWN"];
}; };
TradeInprogress = false; TradeInprogress = false;

View File

@@ -183,8 +183,10 @@ if (_canDo) then {
} else { } else {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled crafting.", "PLAIN DOWN"]; cutText ["Canceled crafting.", "PLAIN DOWN"];
}; };

View File

@@ -183,8 +183,10 @@ if (_canDo) then {
} else { } else {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled crafting.", "PLAIN DOWN"]; cutText ["Canceled crafting.", "PLAIN DOWN"];
}; };

View File

@@ -183,8 +183,10 @@ if (_canDo) then {
} else { } else {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled crafting.", "PLAIN DOWN"]; cutText ["Canceled crafting.", "PLAIN DOWN"];
}; };

View File

@@ -183,8 +183,10 @@ if (_canDo) then {
} else { } else {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled crafting.", "PLAIN DOWN"]; cutText ["Canceled crafting.", "PLAIN DOWN"];
}; };

View File

@@ -183,8 +183,10 @@ if (_canDo) then {
} else { } else {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled crafting.", "PLAIN DOWN"]; cutText ["Canceled crafting.", "PLAIN DOWN"];
}; };

View File

@@ -67,14 +67,19 @@ _availableCans = ["ItemJerrycan","ItemFuelBarrel"];
if (r_interrupt) then { if (r_interrupt) then {
r_doLoop = false; r_doLoop = false;
}; };
if (vehicle player == player) then {
r_doLoop = false;
};
sleep 0.1; sleep 0.1;
}; };
r_doLoop = false; r_doLoop = false;
if(!_finished) then { if(!_finished) then {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
}; };
} else { } else {

View File

@@ -160,7 +160,9 @@ if (_proceed) then {
} else { } else {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
}; };
TradeInprogress = false; TradeInprogress = false;

View File

@@ -87,8 +87,10 @@ if (_section and _hasToolbox) then {
} else { } else {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled Repair.", "PLAIN DOWN"]; cutText ["Canceled Repair.", "PLAIN DOWN"];
}; };

View File

@@ -82,8 +82,10 @@ _availableCansEmpty = ["ItemJerrycanEmpty","ItemFuelBarrelEmpty"];
if(!_finished) then { if(!_finished) then {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
}; };
} else { } else {

View File

@@ -41,8 +41,10 @@ r_doLoop = false;
if(!_finished) then { if(!_finished) then {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled." , "PLAIN DOWN"] cutText ["Canceled." , "PLAIN DOWN"]
}; };

View File

@@ -60,8 +60,10 @@ if (_qty >= _qty_in) then {
if (!_finished) exitWith { if (!_finished) exitWith {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled Trade." , "PLAIN DOWN"]; cutText ["Canceled Trade." , "PLAIN DOWN"];
}; };

View File

@@ -83,8 +83,10 @@ for "_x" from 1 to _total_trades do {
if (!_finished) exitWith { if (!_finished) exitWith {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled Trade." , "PLAIN DOWN"]; cutText ["Canceled Trade." , "PLAIN DOWN"];
}; };

View File

@@ -69,8 +69,10 @@ for "_x" from 1 to _total_trades do {
if (!_finished) exitWith { if (!_finished) exitWith {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled Trade." , "PLAIN DOWN"]; cutText ["Canceled Trade." , "PLAIN DOWN"];
}; };

View File

@@ -61,8 +61,10 @@ if (_qty >= _qty_in) then {
if (!_finished) exitWith { if (!_finished) exitWith {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText ["Canceled Trade." , "PLAIN DOWN"]; cutText ["Canceled Trade." , "PLAIN DOWN"];
}; };

View File

@@ -51,7 +51,9 @@ if (_finished) then {
_unit setVariable ["USEC_injured",false,true]; _unit setVariable ["USEC_injured",false,true];
} else { } else {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
player addMagazine "ItemBandage"; player addMagazine "ItemBandage";
}; };

View File

@@ -50,6 +50,8 @@ if (_finished) then {
}; };
} else { } else {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; if (vehicle player == player) then {
player playActionNow "stop"; [objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
}; };