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 #2050 from MikeMatrix/codeCleanupSpottingscope

Browse Source 
Cleanup code of Spottingscope module
This commit is contained in:
Glowbal 2015-08-08 10:52:50 +02:00
commit df0e13b21c
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/spottingscope/functions/fnc_pickup.sqf
View File

@ -1,30 +1,30 @@
/*
* Author: Rocko, Ruthberg
*
* Pick up spotting scope
*
* Arguments:
* 0: spotting scope <OBJECT>
* 1: unit <OBJECT>
*
* Return Value:
* Nothing
*
* Return value:
* None
*
* Example:
* [spotting_scope, player] call ace_spottingscope_fnc_pickup
*
* Public: No
*/
#include "script_component.hpp"
PARAMS_2(_spottingScope,_unit);
params ["_spottingScope", "_unit"];
if ((_unit call CBA_fnc_getUnitAnim) select 0 == "stand") then {
_unit playMove "AmovPercMstpSrasWrflDnon_diary";
};
[{
PARAMS_2(_spottingScope,_unit);
params ["_spottingScope", "_unit"];
[_unit, "ACE_SpottingScope"] call EFUNC(common,addToInventory);
deleteVehicle _spottingScope;
}, [_spottingScope, _unit], 1, 0]call EFUNC(common,waitAndExecute);

20
addons/spottingscope/functions/fnc_place.sqf
View File

@ -1,21 +1,22 @@
/*
* Author: Rocko, Ruthberg
*
* Place down spotting scope
*
* Arguments:
* 0: unit <OBJECT>
* 1: scope class <STRING>
*
* Return Value:
* Nothing
*
* Return value:
* None
*
* Example:
* [player, "ACE_SpottingScope"] call ace_spottingscope_fnc_place
*
* Public: No
*/
#include "script_component.hpp"
PARAMS_2(_unit,_scopeClass);
params ["_unit", "_scopeClass"];
_unit removeItem _scopeClass;
@ -24,18 +25,17 @@ if ((_unit call CBA_fnc_getUnitAnim) select 0 == "stand") then {
};
[{
PARAMS_1(_unit);
params ["_unit"];
private ["_direction", "_position", "_spottingScope"];
_direction = getDir _unit;
_position = (getPosASL _unit) vectorAdd [0.8 * sin(_direction), 0.8 * cos(_direction), 0.02];
_spottingScope = "ACE_SpottingScopeObject" createVehicle [0, 0, 0];
_spottingScope setDir _direction;
_spottingScope setPosASL _position;
if ((getPosATL _spottingScope select 2) - (getPos _spottingScope select 2) < 1E-5) then {
_spottingScope setVectorUp (surfaceNormal (position _spottingScope));
_spottingScope setVectorUp (surfaceNormal (position _spottingScope));
};
_unit reveal _spottingScope;
}, [_unit], 1, 0] call EFUNC(common,waitAndExecute);