Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3524 from acemod/fixCancelAction

Browse Source 
Fix Cancel (RMB) Action
This commit is contained in:
commy2 2016-03-06 19:16:40 +01:00
commit a9578ab473
16 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/explosives/XEH_PREP.hpp
View File

@ -6,6 +6,7 @@ PREP(addExplosiveActions);
PREP(addToSpeedDial);
PREP(addTransmitterActions);
PREP(addTriggerActions);
PREP(cancelPlacement);
PREP(canDefuse);
PREP(canDetonate);
PREP(connectExplosive);

1
addons/explosives/XEH_missionDisplayLoad.sqf
View File

@ -3,3 +3,4 @@
params ["_display"];
_display displayAddEventHandler ["MouseZChanged", {(_this select 1) call FUNC(handleScrollWheel)}];
_display displayAddEventHandler ["MouseButtonDown", {[ACE_player, _this select 1] call FUNC(cancelPlacement)}];

23
addons/explosives/functions/fnc_cancelPlacement.sqf Normal file
View File

@ -0,0 +1,23 @@
/*
* Author: Garth 'L-H' de Wet
* Cancels explosives placement.
*
* Arguments:
* 0: Unit <OBJECT>
* 1: Key <NUMBER>
*
* Return Value:
* None
*
* Example:
* [unit, 1] call ace_explosives_fnc_cancelPlacement
*
* Public: No
*/
#include "script_component.hpp"
params ["_unit", "_key"];
if (_key != 1 || {!GVAR(pfeh_running)}) exitWith {};
GVAR(placeAction) = PLACE_CANCEL;

8
addons/explosives/functions/fnc_setupExplosive.sqf
View File

@ -141,10 +141,10 @@ GVAR(TweakedAngle) = 0;
//Don't allow placing in a bad position:
if (_badPosition && {GVAR(placeAction) == PLACE_APPROVE}) then {GVAR(placeAction) = PLACE_WAITING;};
if (((inputAction "zoomTemp") > 0) || //Cancel on RMB, For some reason this works (when held) but AddActionEventHandler doesn't
{_unit != ACE_player} ||
{!([_unit, objNull, ["isNotSwimming"]] call EFUNC(common,canInteractWith))} ||
{!(_magClassname in (magazines _unit))}) then {
if (_unit != ACE_player ||
{!([_unit, objNull, ["isNotSwimming"]] call EFUNC(common,canInteractWith))} ||
{!(_magClassname in (magazines _unit))}
) then {
GVAR(placeAction) = PLACE_CANCEL;
};

1
addons/sandbag/XEH_missionDisplayLoad.sqf
View File

@ -3,3 +3,4 @@
params ["_display"];
_display displayAddEventHandler ["MouseZChanged", {(_this select 1) call FUNC(handleScrollWheel)}];
_display displayAddEventHandler ["MouseButtonDown", {[ACE_player, _this select 1] call FUNC(deployCancel)}];

6
addons/sandbag/functions/fnc_deploy.sqf
View File

@ -52,10 +52,4 @@ _unit setVariable [QGVAR(Deploy), [
{[_this select 0] call FUNC(deployConfirm)}
] call EFUNC(common,addActionEventHandler)];
_unit setVariable [QGVAR(Cancel), [
_unit, "zoomtemp",
{GVAR(deployPFH) != -1},
{[_this select 0] call FUNC(deployCancel)}
] call EFUNC(common,addActionEventHandler)];
_unit setVariable [QGVAR(isDeploying), true, true];

7
addons/sandbag/functions/fnc_deployCancel.sqf
View File

@ -3,7 +3,8 @@
* Cancels sandbag deployment
*
* Arguments:
* 0: unit <OBJECT>
* 0: Unit <OBJECT>
* 1: Key <NUMBER>
*
* Return Value:
* None
@ -15,7 +16,9 @@
*/
#include "script_component.hpp"
params ["_unit"];
params ["_unit", "_key"];
if (_key != 1 || {GVAR(deployPFH) == -1}) exitWith {};
// enable running again
[_unit, "forceWalk", "ACE_Sandbag", false] call EFUNC(common,statusEffect_set);

1
addons/sandbag/functions/fnc_deployConfirm.sqf
View File

@ -51,7 +51,6 @@ GVAR(deployPFH) = -1;
call EFUNC(interaction,hideMouseHint);
[_unit, "DefaultAction", _unit getVariable [QGVAR(Deploy), -1]] call EFUNC(common,removeActionEventHandler);
[_unit, "zoomtemp", _unit getVariable [QGVAR(Cancel), -1]] call EFUNC(common,removeActionEventHandler);
// play animation
_unit playActionNow "PutDown";

1
addons/tacticalladder/XEH_missionDisplayLoad.sqf
View File

@ -3,3 +3,4 @@
params ["_display"];
_display displayAddEventHandler ["MouseZChanged", {(_this select 1) call FUNC(handleScrollWheel)}];
_display displayAddEventHandler ["MouseButtonDown", {[ACE_player, _this select 1] call FUNC(cancelTLdeploy)}];

15
addons/tacticalladder/functions/fnc_cancelTLdeploy.sqf
View File

@ -3,8 +3,8 @@
* Cancel tactical ladder deployment
*
* Arguments:
* 0: unit <OBJECT>
* 1: ladder <OBJECT>
* 0: Unit <OBJECT>
* 1: Key <NUMBER>
*
* Return Value:
* None
@ -18,23 +18,24 @@
#define __ANIMS ["extract_1","extract_2","extract_3","extract_4","extract_5","extract_6","extract_7","extract_8","extract_9","extract_10","extract_11"]
params ["_unit", "_ladder"];
params ["_unit", "_key"];
if (_key != 1 || {isNull GVAR(ladder)}) exitWith {};
// enable running again
[_unit, "forceWalk", "ACE_Ladder", false] call EFUNC(common,statusEffect_set);
detach _ladder;
detach GVAR(ladder);
_ladder animate ["rotate", 0];
GVAR(ladder) animate ["rotate", 0];
{
_ladder animate [_x, 0];
GVAR(ladder) animate [_x, 0];
} count __ANIMS;
// remove mouse buttons and hint
call EFUNC(interaction,hideMouseHint);
[_unit, "DefaultAction", _unit getVariable [QGVAR(Deploy), -1]] call EFUNC(Common,removeActionEventHandler);
[_unit, "zoomtemp", _unit getVariable [QGVAR(Cancel), -1]] call EFUNC(Common,removeActionEventHandler);
GVAR(ladder) = objNull;

1
addons/tacticalladder/functions/fnc_confirmTLdeploy.sqf
View File

@ -34,7 +34,6 @@ detach _ladder;
call EFUNC(interaction,hideMouseHint);
[_unit, "DefaultAction", _unit getVariable [QGVAR(Deploy), -1]] call EFUNC(common,removeActionEventHandler);
[_unit, "zoomtemp", _unit getVariable [QGVAR(Cancel), -1]] call EFUNC(common,removeActionEventHandler);
GVAR(ladder) = objNull;

6
addons/tacticalladder/functions/fnc_positionTL.sqf
View File

@ -50,9 +50,3 @@ _unit setVariable [QGVAR(Deploy), [
{!isNull GVAR(ladder)},
{[_this select 0, GVAR(ladder)] call FUNC(confirmTLdeploy)}
] call EFUNC(common,addActionEventHandler)];
_unit setVariable [QGVAR(Cancel), [
_unit, "zoomtemp",
{!isNull GVAR(ladder)},
{[_this select 0, GVAR(ladder)] call FUNC(cancelTLdeploy)}
] call EFUNC(common,addActionEventHandler)];

1
addons/trenches/XEH_missionDisplayLoad.sqf
View File

@ -3,3 +3,4 @@
params ["_display"];
_display displayAddEventHandler ["MouseZChanged", {(_this select 1) call FUNC(handleScrollWheel)}];
_display displayAddEventHandler ["MouseButtonDown", {[ACE_player, _this select 1] call FUNC(placeCancel)}];

8
addons/trenches/functions/fnc_placeCancel.sqf
View File

@ -3,7 +3,8 @@
* Cancels trench dig
*
* Arguments:
* 0: unit <OBJECT>
* 0: Unit <OBJECT>
* 1: Key <NUMBER>
*
* Return Value:
* None
@ -15,7 +16,9 @@
*/
#include "script_component.hpp"
params ["_unit"];
params ["_unit", "_key"];
if (_key != 1 || {GVAR(digPFH) == -1}) exitWith {};
// enable running again
[_unit, "forceWalk", "ACE_Trenches", false] call EFUNC(common,statusEffect_set);
@ -31,6 +34,5 @@ GVAR(digPFH) = -1;
call EFUNC(interaction,hideMouseHint);
[_unit, "DefaultAction", _unit getVariable [QGVAR(Dig), -1]] call EFUNC(common,removeActionEventHandler);
[_unit, "zoomtemp", _unit getVariable [QGVAR(Cancel), -1]] call EFUNC(common,removeActionEventHandler);
_unit setVariable [QGVAR(isPlacing), false, true];

1
addons/trenches/functions/fnc_placeConfirm.sqf
View File

@ -28,7 +28,6 @@ GVAR(digPFH) = -1;
call EFUNC(interaction,hideMouseHint);
[_unit, "DefaultAction", _unit getVariable [QGVAR(Dig), -1]] call EFUNC(common,removeActionEventHandler);
[_unit, "zoomtemp", _unit getVariable [QGVAR(Cancel), -1]] call EFUNC(common,removeActionEventHandler);
_unit setVariable [QGVAR(isPlacing), false, true];

6
addons/trenches/functions/fnc_placeTrench.sqf
View File

@ -95,10 +95,4 @@ _unit setVariable [QGVAR(Dig), [
{[_this select 0] call FUNC(placeConfirm)}
] call EFUNC(common,addActionEventHandler)];
_unit setVariable [QGVAR(Cancel), [
_unit, "zoomtemp",
{GVAR(digPFH) != -1},
{[_this select 0] call FUNC(placeCancel)}
] call EFUNC(common,addActionEventHandler)];
_unit setVariable [QGVAR(isPlacing), true, true];