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

Prevent switching to weapon while carrying fuel nozzle - fix #4601

Browse Source
This commit is contained in:
jonpas 2016-11-02 18:44:39 +01:00
parent aef7010d67
commit 14c9cffb6a
4 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/refuel/XEH_PREP.hpp
View File

@ -14,6 +14,7 @@ PREP(dropNozzle);
PREP(getFuel); PREP(getFuel);
PREP(handleDisconnect); PREP(handleDisconnect);
PREP(handleKilled); PREP(handleKilled);
PREP(handlePlayerWeaponChanged);
PREP(handleUnconscious); PREP(handleUnconscious);
PREP(makeJerryCan); PREP(makeJerryCan);
PREP(maxDistanceDropNozzle); PREP(maxDistanceDropNozzle);

1
addons/refuel/XEH_postInit.sqf
View File

@ -1,6 +1,7 @@
#include "script_component.hpp" #include "script_component.hpp"
["ace_unconscious", {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; ["ace_unconscious", {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler;
["weapon", FUNC(handlePlayerWeaponChanged)] call CBA_fnc_addPlayerEventHandler;
if (isServer) then { if (isServer) then {
addMissionEventHandler ["HandleDisconnect", {_this call FUNC(handleDisconnect)}]; addMissionEventHandler ["HandleDisconnect", {_this call FUNC(handleDisconnect)}];

29
addons/refuel/functions/fnc_handlePlayerWeaponChanged.sqf Normal file
View File

@ -0,0 +1,29 @@
/*
* Author: Jonpas
* Drops nozzle or jerry can when selecting a weapon.
*
* Arguments:
* 0: Unit <OBJECT>
* 1: Weapon <STRING> (unused)
*
* Return Value:
* None
*
* Example:
* [_unit, "gun"] call ace_refuel_fnc_handlePlayerWeaponChanged;
*
* Public: No
*/
#include "script_component.hpp"
params ["_unit"];
// Drop nozzle/jerry can when selecting a non-primary weapon
if (_unit getVariable [QGVAR(isRefueling), false]) then {
private _nozzle = _unit getVariable [QGVAR(nozzle), objNull];
if !(isNull _nozzle) then {
[_unit, _nozzle] call FUNC(dropNozzle);
_unit setVariable [QGVAR(selectedWeaponOnRefuel), nil];
[_unit, "forceWalk", "ACE_refuel", false] call EFUNC(common,statusEffect_set);
};
};

4
addons/refuel/functions/fnc_maxDistanceDropNozzle.sqf
View File

@ -33,6 +33,10 @@ if (_nozzle getVariable [QGVAR(jerryCan), false]) exitWith {};
["_nozzle", (_args select 0) getVariable [QGVAR(nozzle), objNull], [objNull]] ["_nozzle", (_args select 0) getVariable [QGVAR(nozzle), objNull], [objNull]]
]; ];
if (_unit getVariable [QGVAR(isRefueling), false]) exitWith {
[_pfID] call CBA_fnc_removePerFrameHandler;
};
if (isNull _source || {_unit distance (_source modelToWorld _endPosOffset) > (REFUEL_HOSE_LENGTH - 2)} || {!alive _source}) exitWith { if (isNull _source || {_unit distance (_source modelToWorld _endPosOffset) > (REFUEL_HOSE_LENGTH - 2)} || {!alive _source}) exitWith {
if !(isNull _nozzle) then { if !(isNull _nozzle) then {
[_unit, _nozzle] call FUNC(dropNozzle); [_unit, _nozzle] call FUNC(dropNozzle);