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

FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution

Browse Source
This commit is contained in:
PabstMirror 2016-05-10 10:09:52 -05:00
parent 7d063d0995
commit 980da16826
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.txt
View File

@ -112,6 +112,7 @@ Sniperwolf572 <tenga6@gmail.com>
System98 System98
SzwedzikPL <szwedzikpl@gmail.com> SzwedzikPL <szwedzikpl@gmail.com>
Tachi <zaveruha007@gmail.com> Tachi <zaveruha007@gmail.com>
Tessa Elieff <Fastroping Sound - CreativeCommons Attributions 3.0>
Toaster <jonathan.pereira@gmail.com> Toaster <jonathan.pereira@gmail.com>
Tonic Tonic
Tourorist <tourorist@gmail.com> Tourorist <tourorist@gmail.com>

2
LICENSE
View File

@ -26,6 +26,8 @@ Some folders of this project may contain a separate LICENSE file. Should
that be the case, everything in that folder and all subfolders is subject that be the case, everything in that folder and all subfolders is subject
to that license instead. to that license instead.
- ARMA PUBLIC LICENSE (\addons\apl)
- CreativeCommons Attributions 3.0 (\addons\fastroping\data\sounds)
============================================================================ ============================================================================
Full GNU General Public License Text Full GNU General Public License Text

1
addons/fastroping/config.cpp
View File

@ -14,5 +14,6 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgMoves.hpp" #include "CfgMoves.hpp"
#include "CfgSounds.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWaypoints.hpp" #include "CfgWaypoints.hpp"

2
addons/fastroping/functions/fnc_fastRope.sqf
View File

@ -37,4 +37,4 @@ _vehicle setVariable [QGVAR(deployedRopes), _deployedRopes, true];
//Start server PFH asap //Start server PFH asap
[QGVAR(startFastRope), [_unit, _vehicle, _usableRope, _usableRopeIndex, false]] call EFUNC(common,serverEvent); [QGVAR(startFastRope), [_unit, _vehicle, _usableRope, _usableRopeIndex, false]] call EFUNC(common,serverEvent);
moveOut _unit; moveOut _unit;
[FUNC(fastRopeLocalPFH), 0, [_unit, _vehicle, _usableRope, _usableRopeIndex]] call CBA_fnc_addPerFrameHandler; [FUNC(fastRopeLocalPFH), 0, [_unit, _vehicle, _usableRope, _usableRopeIndex, ACE_diagTime]] call CBA_fnc_addPerFrameHandler;

19
addons/fastroping/functions/fnc_fastRopeLocalPFH.sqf
View File

@ -17,7 +17,7 @@
#include "script_component.hpp" #include "script_component.hpp"
params ["_arguments", "_pfhHandle"]; params ["_arguments", "_pfhHandle"];
_arguments params ["_unit", "_vehicle", "_rope", "_ropeIndex"]; _arguments params ["_unit", "_vehicle", "_rope", "_ropeIndex", "_timeToPlayRopeSound"];
_rope params ["_attachmentPoint", "_ropeTop", "_ropeBottom", "_dummy", "_hook", "_occupied"]; _rope params ["_attachmentPoint", "_ropeTop", "_ropeBottom", "_dummy", "_hook", "_occupied"];
private ["_vectorUp", "_vectorDir", "_origin"]; private ["_vectorUp", "_vectorDir", "_origin"];
@ -29,22 +29,12 @@ if (animationState _unit != "ACE_FastRoping") exitWith {
_unit disableCollisionWith _dummy; _unit disableCollisionWith _dummy;
_unit attachTo [_dummy, [0, 0, -1.45]]; _unit attachTo [_dummy, [0, 0, -1.45]];
[_unit, "ACE_FastRoping", 2] call EFUNC(common,doAnimation); [_unit, "ACE_FastRoping", 2] call EFUNC(common,doAnimation);
[{
params ["_args", "_idPFH"];
_args params ["_unit"];
if (isNull (attachedTo _unit)) exitWith {
[_idPFH] call CBA_fnc_removePerFrameHandler;
};
playSound QGVAR(Rope);
}, 1, [_unit]] call CBA_fnc_addPerFrameHandler;
}; };
//End of fast rope //End of fast rope
if (isNull attachedTo _unit) exitWith { if (isNull attachedTo _unit) exitWith {
TRACE_1("exit pfeh",_unit);
[_unit, "", 2] call EFUNC(common,doAnimation); [_unit, "", 2] call EFUNC(common,doAnimation);
_unit setVectorUp [0, 0, 1]; _unit setVectorUp [0, 0, 1];
@ -52,3 +42,8 @@ if (isNull attachedTo _unit) exitWith {
[_pfhHandle] call CBA_fnc_removePerFrameHandler; [_pfhHandle] call CBA_fnc_removePerFrameHandler;
}; };
if (ACE_diagTime > _timeToPlayRopeSound) then {
_arguments set [4, (_timeToPlayRopeSound + 1)];
playSound QGVAR(Rope);
};