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

convert laser to cba hashes (#4186)

Browse Source
This commit is contained in:
commy2
2016-07-30 17:16:29 +02:00
committed by Glowbal
parent c117a79431
commit 1f6b10c4cb
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/laser/XEH_pre_init.sqf
View File

@ -11,6 +11,6 @@ ACE_DEFAULT_LASER_CODE = 1001;
ACE_DEFAULT_LASER_WAVELENGTH = 1550; ACE_DEFAULT_LASER_WAVELENGTH = 1550;
ACE_DEFAULT_LASER_BEAMSPREAD = 1; ACE_DEFAULT_LASER_BEAMSPREAD = 1;
GVAR(laserEmitters) = HASH_CREATE; GVAR(laserEmitters) = [] call CBA_fnc_hashCreate;
ADDON = true; ADDON = true;

4
addons/laser/functions/fnc_drawVisibleLaserTargets.sqf
View File

@ -5,5 +5,5 @@ ACE_LOGINFO("Laser Emitter Dump");
{ {
ACE_LOGINFO_1(" %1", _x); ACE_LOGINFO_1(" %1", _x);
ACE_LOGINFO_1(" %1",HASH_GET(GVAR(laserEmitters),_x)); ACE_LOGINFO_1(" %1",[ARR_2(GVAR(laserEmitters),_x)] call CBA_fnc_hashGet);
} forEach GVAR(laserEmitters) select 0; } forEach (GVAR(laserEmitters) select 1);

4
addons/laser/functions/fnc_handleLaserOff.sqf
View File

@ -3,6 +3,6 @@
private ["_uuid"]; private ["_uuid"];
_uuid = _this select 0; _uuid = _this select 0;
if(HASH_HASKEY(GVAR(laserEmitters), _uuid)) then { if ([GVAR(laserEmitters), _uuid] call CBA_fnc_hashHasKey) then {
HASH_REM(GVAR(laserEmitters), _uuid); [GVAR(laserEmitters), _uuid] call CBA_fnc_hashRem;
}; };

2
addons/laser/functions/fnc_handleLaserOn.sqf
View File

@ -4,4 +4,4 @@
private ["_uuid", "_args"]; private ["_uuid", "_args"];
_uuid = _this select 0; _uuid = _this select 0;
_args = _this select 1; _args = _this select 1;
HASH_SET(GVAR(laserEmitters), _uuid, _args); [GVAR(laserEmitters), _uuid, _args] call CBA_fnc_hashSet;

12
addons/laser/functions/fnc_seekerFindLaserSpot.sqf
View File

@ -76,7 +76,7 @@ _finalOwner = nil;
} forEach (_res select 2); } forEach (_res select 2);
}; };
}; };
} forEach (GVAR(laserEmitters) select 1); } forEach (GVAR(laserEmitters) select 2);
if((count _spots) > 0) then { if((count _spots) > 0) then {
_bucketPos = nil; _bucketPos = nil;
@ -123,7 +123,7 @@ if((count _spots) > 0) then {
} forEach _buckets; } forEach _buckets;
_finalBucket = _finalBuckets select _largestIndex; _finalBucket = _finalBuckets select _largestIndex;
_owners = HASH_CREATE; _owners = [] call CBA_fnc_hashCreate;
if(count _finalBucket > 0) then { if(count _finalBucket > 0) then {
_avgX = 0; _avgX = 0;
@ -135,11 +135,11 @@ if((count _spots) > 0) then {
_avgY = _avgY + ((_x select 0) select 1); _avgY = _avgY + ((_x select 0) select 1);
_avgZ = _avgZ + ((_x select 0) select 2); _avgZ = _avgZ + ((_x select 0) select 2);
_owner = _x select 1; _owner = _x select 1;
if(HASH_HASKEY(_owners, _owner)) then { if ([_owners, _owner] call CBA_fnc_hashHasKey) then {
_count = HASH_GET(_owners, _owner); private _count = [_owners, _owner] call CBA_fnc_hashGet;
HASH_SET(_owners, _owner, _count+1); [_owners, _owner, _count + 1] call CBA_fnc_hashSet;
} else { } else {
HASH_SET(_owners, _owner, 1); [_owners, _owner, 1] call CBA_fnc_hashSet;
}; };
} forEach _finalBucket; } forEach _finalBucket;
_count = count _finalBucket; _count = count _finalBucket;