Merge pull request #1314 from acemod/Explosives_PlacementAnimation

Changed the animation from medic to put when placing an explosive.
This commit is contained in:
Nicolás Badano 2015-05-19 16:07:58 -03:00
commit 4d3521cff4
2 changed files with 3 additions and 1 deletions

View File

@ -25,6 +25,8 @@ private ["_ammo", "_explosive", "_attachedTo", "_expPos", "_magazineTrigger"];
EXPLODE_6_PVT(_this,_unit,_pos,_dir,_magazineClass,_triggerConfig,_triggerSpecificVars); EXPLODE_6_PVT(_this,_unit,_pos,_dir,_magazineClass,_triggerConfig,_triggerSpecificVars);
DEFAULT_PARAM(6,_setupPlaceholderObject,objNull); DEFAULT_PARAM(6,_setupPlaceholderObject,objNull);
_unit playActionNow "PutDown";
_attachedTo = objNull; _attachedTo = objNull;
if (!isNull _setupPlaceholderObject) then { if (!isNull _setupPlaceholderObject) then {
_attachedTo = attachedTo _setupPlaceholderObject; _attachedTo = attachedTo _setupPlaceholderObject;

View File

@ -42,5 +42,5 @@ _player setVariable [QGVAR(PlantingExplosive), true];
[{_this setVariable [QGVAR(PlantingExplosive), false]}, _player, 1.5, 0.5] call EFUNC(common,waitAndExecute); [{_this setVariable [QGVAR(PlantingExplosive), false]}, _player, 1.5, 0.5] call EFUNC(common,waitAndExecute);
_setup addEventHandler ["EpeContactStart", FUNC(onLanded)]; _setup addEventHandler ["EpeContactStart", FUNC(onLanded)];
_setup enableSimulationGlobal true; _setup enableSimulationGlobal true;
_player playActionNow "MedicOther"; _player playActionNow "PutDown";
_player removeMagazine (_setup getVariable [QGVAR(Class), ""]); _player removeMagazine (_setup getVariable [QGVAR(Class), ""]);