Skip to content

Commit cf0568e

Browse files
committed
updates for HEMTT 1.13.0
1 parent 7f6c653 commit cf0568e

18 files changed

+26
-26
lines changed

addons/Streamator/Spectator/Draw/fn_draw3dEH.sqf

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ private _intersectTarget = AGLToASL positionCameraToWorld [0, 0, 10000];
2121
private _object = lineIntersectsSurfaces [
2222
_intersectCam,
2323
_intersectTarget,
24-
objnull,
25-
objnull,
24+
objNull,
25+
objNull,
2626
true,
2727
1,
2828
"GEOM",

addons/Streamator/Spectator/DrawCalls/fn_drawAceMapGestures.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ params ["_map", "_textSize"];
1818
{
1919
private _pos = _x getVariable "ace_map_gestures_pointPosition";
2020
if (!isNil "_pos" && {_pos isNotEqualTo []}) then {
21-
private _grpName = groupID (group _x);
21+
private _grpName = groupId (group _x);
2222

2323
// If color settings for the group exist, then use those, otherwise fall back to the default colors
2424
private _color = (GVAR(ace_map_gestures_color_namespace) getVariable [_grpName, [GVAR(ace_map_gestures_defaultLeadColor), GVAR(ace_map_gestures_defaultLeadColor)]]) select (_x isNotEqualTo leader _x);

addons/Streamator/Spectator/DrawCalls/fn_drawMeasureDistance.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ if (_interSectPos isEqualTo []) then {
5353
_map drawIcon ["A3\ui_f\data\GUI\Cfg\Cursors\hc_move_gs.paa", [1, 1, 1, 1], _interSectPos, 12.5, 12.5, 0, ""];
5454
_map drawLine [_pos1, _interSectPos, [0, 1, 0, 1]];
5555
_map drawEllipse [_pos1, _distance, _distance, 0, [1,0,0,1], ""];
56-
_distance = _pos1 distance2d _interSectPos;
56+
_distance = _pos1 distance2D _interSectPos;
5757
_map drawEllipse [_pos1, _distance, _distance, 0, [0,1,0,1], ""];
5858
};

addons/Streamator/Spectator/DrawCalls/fn_updateAndDrawBulletTracer.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
params ["_bulletDrawCall", "_thrownDrawCall", "_arg"];
1717

1818
private _deleted = false;
19-
private _ifSkipUpdate = if ((diag_frameno mod 3) == 0);
19+
private _ifSkipUpdate = if ((diag_frameNo mod 3) == 0);
2020
{
2121
_x params ["_color", "_startPos", "_projectile", ["_segments", []]];
2222
if (alive _projectile) then {

addons/Streamator/Spectator/Marker/fn_collectMarkerData.sqf

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if (markerShape _marker == "POLYLINE") then {
1818
[
1919
false,
2020
markerPolyline _marker,
21-
(configfile >> "CfgMarkerColors" >> markerColor _marker >> "color") call BIS_fnc_colorConfigToRGBA
21+
(configFile >> "CfgMarkerColors" >> markerColor _marker >> "color") call BIS_fnc_colorConfigToRGBA
2222
];
2323
} else {
2424
[
@@ -27,6 +27,6 @@ if (markerShape _marker == "POLYLINE") then {
2727
markerPos _marker,
2828
markerDir _marker,
2929
getText ([(configFile >> "CfgMarkers" >> markerType _marker >> "icon"), (configFile >> "CfgMarkers" >> markerType _marker >> "texture")] select (isText (configFile >> "CfgMarkers" >> markerType _marker >> "texture"))),
30-
(configfile >> "CfgMarkerColors" >> markerColor _marker >> "color") call BIS_fnc_colorConfigToRGBA
30+
(configFile >> "CfgMarkerColors" >> markerColor _marker >> "color") call BIS_fnc_colorConfigToRGBA
3131
];
3232
};

addons/Streamator/Spectator/UI/fn_buildFPSUI.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ _ctrlMinimap ctrlAddEventHandler ["Draw", {
9696

9797
private _mapCenterWorldPos = _map ctrlMapScreenToWorld [(_mapPosition select 0) + ((_mapPosition select 2)/2), (_mapPosition select 1) + ((_mapPosition select 3)/2)];
9898

99-
private _screenCenterWorldPos = _map ctrlMapScreenToWorld [(_mapPosition select 0) + safeZoneWAbs/2, (_mapPosition select 1) + (SafeZoneH - 1.5 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))/2];
99+
private _screenCenterWorldPos = _map ctrlMapScreenToWorld [(_mapPosition select 0) + safeZoneWAbs/2, (_mapPosition select 1) + (safeZoneH - 1.5 *((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25))/2];
100100
_screenCenterWorldPos set [2, 0];
101101
_mapCenterWorldPos set [2, 0];
102102
_position = _position vectorAdd (_screenCenterWorldPos vectorDiff _mapCenterWorldPos);

addons/Streamator/Spectator/UI/fn_buildUI.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ private _ctrlPlanningChannel = _display ctrlCreate ["RscStructuredText", -1, _ct
208208
_ctrlPlanningChannel ctrlSetPosition [0, safeZoneH - PY(BORDERWIDTH), safeZoneW , PY(1.8)];
209209
_ctrlPlanningChannel ctrlSetFont "RobotoCondensedBold";
210210
_ctrlPlanningChannel ctrlSetFontHeight PY(2);
211-
_ctrlPlanningChannel ctrlSetStructuredText parseText format ["<t color='%2'>Channel: %1 | </t><t size='%5' color='%3'>Color: %4</t>", "All", ["#ffffff", "#ffffff", "#3CB371"] select GVAR(InputMode), GVAR(PlanningModeColorHTML) select GVAR(PlanningModeColor), GVAR(PlanningModeColor)];
211+
_ctrlPlanningChannel ctrlSetStructuredText parseText format ["<t color='%2'>Channel: %1 | </t><t color='%3'>Color: %4</t>", "All", ["#ffffff", "#ffffff", "#3CB371"] select GVAR(InputMode), GVAR(PlanningModeColorHTML) select GVAR(PlanningModeColor), GVAR(PlanningModeColor)];
212212
_ctrlPlanningChannel ctrlCommit 0;
213213

214214
[QGVAR(PlanningModeChannelChanged), {

addons/Streamator/Spectator/UI/fn_buildUnitInfoUI.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private _xPosition = 41;
155155
_ctrlMagInfo2 ctrlSetText "99"; //Magazine load
156156
_ctrlMagInfo2 ctrlCommit 0;
157157
_xPosition = _xPosition + 19.5;
158-
_ctrlWeaponSlots pushback [_ctrlGrp, _ctrlWeaponPicture, _ctrlWeaponName, _ctrlMagInfo, _ctrlMagInfo2, _ctrlMagIcon];
158+
_ctrlWeaponSlots pushBack [_ctrlGrp, _ctrlWeaponPicture, _ctrlWeaponName, _ctrlMagInfo, _ctrlMagInfo2, _ctrlMagIcon];
159159
} forEach [
160160
["MX 6.5MM", "\A3\weapons_F\Rifles\MX\data\UI\gear_mx_rifle_X_CA.paa"],
161161
["NLAW","\A3\weapons_f\launchers\nlaw\data\UI\gear_nlaw_ca.paa"],

addons/Streamator/Spectator/User/fn_addSearchTarget.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if (isNil QGVAR(CustomSearchItems)) then {
2828
};
2929
private _index = GVAR(CustomSearchItems) findIf {_x select 0 == _name};
3030
if (_index == -1) then {
31-
GVAR(CustomSearchItems) pushback [_name, [_target, _distance, _hight]];
31+
GVAR(CustomSearchItems) pushBack [_name, [_target, _distance, _hight]];
3232
} else {
3333
GVAR(CustomSearchItems) set [_index, [_name, [_target, _distance, _hight]]]
3434
};

addons/Streamator/Spectator/User/fn_isSpectator.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
is Spectator <Bool>
1515
*/
1616
params ["_unit"];
17-
(_unit isKindof "VirtualSpectator_F" && side _unit isEqualTo sideLogic)
17+
(_unit isKindOf "VirtualSpectator_F" && side _unit isEqualTo sideLogic)
1818
|| _unit getVariable ["Streamator_isSpectator", false]

addons/Streamator/Spectator/fn_clientInit.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ GVAR(aceAdvancedThrowingLoaded) = isClass (configFile >> "CfgPatches" >> "ace_ad
2828
"initializeSpectator" call CFUNC(localEvent);
2929
};
3030
CLib_Player setVariable [QGVAR(isPlayer), true, true];
31-
CLib_Player addEventhandler ["FiredMan", {
31+
CLib_Player addEventHandler ["FiredMan", {
3232
if (GVAR(Streamators) isEqualTo []) exitWith {};
3333
params ["_unit", "_weapon", "", "", "_ammo", "", "_projectile"];
3434
if (_ammo isKindOf "BombCore") then {

addons/Streamator/Spectator/fn_getMousePositionInWorld.sqf

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ if (GVAR(useTerrainIntersect)) then {
1919
private _intersectArray = lineIntersectsSurfaces [AGLToASL _startPosition, AGLToASL _endPosition];
2020
if (_intersectArray isNotEqualTo []) then {
2121
(_intersectArray select 0) params ["_intersectPosition"];
22-
_endPosition = ASLtoAGL _intersectPosition;
22+
_endPosition = ASLToAGL _intersectPosition;
2323
};
2424
} else {
25-
private _ti = ASLtoAGL terrainIntersectAtASL [AGLToASL _startPosition, AGLToASL _endPosition];
25+
private _ti = ASLToAGL terrainIntersectAtASL [AGLToASL _startPosition, AGLToASL _endPosition];
2626
if ((_ti distance2D [0,0,0]) > 1) then {
2727
_endPosition = _ti;
2828
};

addons/Streamator/Spectator/fn_openSpectator.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ if (GVAR(aceSpectatorLoaded)) then {
335335
}] call CBA_fnc_addEventHandler;
336336
};
337337

338-
if (CLib_Player isKindof "VirtualSpectator_F" && side CLib_Player isEqualTo sideLogic) then {
338+
if (CLib_Player isKindOf "VirtualSpectator_F" && side CLib_Player isEqualTo sideLogic) then {
339339
[_fnc_init, {
340340
(missionNamespace getVariable ["BIS_EGSpectator_initialized", false]) && !isNull findDisplay 60492;
341341
}] call CFUNC(waitUntil);

addons/Streamator/Spectator/fn_setVisionMode.sqf

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
switch (GVAR(CameraVision)) do {
1717
case (9): {
1818
camUseNVG false;
19-
false setCamUseTi 0;
19+
false setCamUseTI 0;
2020
};
2121
case (8): {
2222
camUseNVG true;
23-
false setCamUseTi 0;
23+
false setCamUseTI 0;
2424
};
2525
default {
2626
camUseNVG false;
27-
true setCamUseTi GVAR(CameraVision);
27+
true setCamUseTI GVAR(CameraVision);
2828
};
2929
};

addons/Streamator/Spectator/fn_updatePlanningMarkers.sqf

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if (GVAR(PlanningModeDrawing) && { GVAR(InputMode) == INPUTMODE_PLANINGMODE }) t
2525
private _intersectArray = lineIntersectsSurfaces [AGLToASL _cameraPosition, AGLToASL _position, objNull, objNull, true, 1, "GEOM", "NONE", false];
2626
if (_intersectArray isNotEqualTo []) then {
2727
(_intersectArray select 0) params ["_intersectPosition"];
28-
_position = ASLtoAGL _intersectPosition;
28+
_position = ASLToAGL _intersectPosition;
2929
};
3030
};
3131
[_serverTime, _position] call FUNC(updatePlanningCursorPosition);
@@ -52,16 +52,16 @@ _targets = _targets select {
5252
if (_lastPosition isNotEqualTo _cursorPos) then {
5353
_lastPosition params ["_lasttime", "_lastpos"];
5454
if ((_newtime - _lasttime) < 0.2) then {
55-
_lastpos = AGLtoASL _lastpos;
56-
_newpos = AGLtoASL _newpos;
55+
_lastpos = AGLToASL _lastpos;
56+
_newpos = AGLToASL _newpos;
5757
private _diffpos = _newpos vectorDiff _lastpos;
5858
private _dist = vectorMagnitude _diffpos;
5959
_diffpos = vectorNormalized _diffPos;
6060
private _nSteps = (round (_dist/5) min 20) max 2;
6161
private _tSteps = (_newtime - _lasttime)/_nSteps;
6262
private _sSteps = _dist/_nSteps;
6363
for "_cnt" from 1 to _nSteps do {
64-
_cursorHistory pushBackUnique [_lasttime + _tSteps*_cnt, ASLtoAGL (_lastpos vectorAdd (_diffPos vectorMultiply (_cnt*_sSteps)))];
64+
_cursorHistory pushBackUnique [_lasttime + _tSteps*_cnt, ASLToAGL (_lastpos vectorAdd (_diffPos vectorMultiply (_cnt*_sSteps)))];
6565
};
6666
};
6767
_cursorHistory pushBackUnique _cursorPos;

addons/Streamator/Spectator/fn_updateValidUnits.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ _allUnits = _allUnits arrayIntersect _allUnits;
2020
{
2121
private _valid = _x call FUNC(isValidUnit);
2222
_x setVariable [QGVAR(isValidUnit), _valid];
23-
} foreach _allUnits;
23+
} forEach _allUnits;
2424

2525
{
2626
private _uavData = UAVControl _x;

addons/Streamator/UnitTracker/fn_addUnitToTracker.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private _manIcon = ["ICON", _icon, _color, _newUnit, 20, 20, _newUnit, "", 1, 0.
2727
_height = _width;
2828
};
2929

30-
if ((toUpper (lifeState _position)) == "INCAPACITATED") exitWith {
30+
if ((toUpperANSI (lifeState _position)) == "INCAPACITATED") exitWith {
3131
_color = [0.3, 0.3, 0.3, 0.5];
3232
_texture = "\A3\ui_f\data\igui\cfg\revive\overlayicons\u100_ca.paa";
3333
_color = [1, 0, 0, 1];

include/tc/CLib

Submodule CLib updated 56 files

0 commit comments

Comments
 (0)