Skip to content

Commit

Permalink
updates for HEMTT 1.13.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jokoho48 committed Sep 3, 2024
1 parent 7f6c653 commit cf0568e
Show file tree
Hide file tree
Showing 18 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions addons/Streamator/Spectator/Draw/fn_draw3dEH.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ private _intersectTarget = AGLToASL positionCameraToWorld [0, 0, 10000];
private _object = lineIntersectsSurfaces [
_intersectCam,
_intersectTarget,
objnull,
objnull,
objNull,
objNull,
true,
1,
"GEOM",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ params ["_map", "_textSize"];
{
private _pos = _x getVariable "ace_map_gestures_pointPosition";
if (!isNil "_pos" && {_pos isNotEqualTo []}) then {
private _grpName = groupID (group _x);
private _grpName = groupId (group _x);

// If color settings for the group exist, then use those, otherwise fall back to the default colors
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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ if (_interSectPos isEqualTo []) then {
_map drawIcon ["A3\ui_f\data\GUI\Cfg\Cursors\hc_move_gs.paa", [1, 1, 1, 1], _interSectPos, 12.5, 12.5, 0, ""];
_map drawLine [_pos1, _interSectPos, [0, 1, 0, 1]];
_map drawEllipse [_pos1, _distance, _distance, 0, [1,0,0,1], ""];
_distance = _pos1 distance2d _interSectPos;
_distance = _pos1 distance2D _interSectPos;
_map drawEllipse [_pos1, _distance, _distance, 0, [0,1,0,1], ""];
};
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
params ["_bulletDrawCall", "_thrownDrawCall", "_arg"];

private _deleted = false;
private _ifSkipUpdate = if ((diag_frameno mod 3) == 0);
private _ifSkipUpdate = if ((diag_frameNo mod 3) == 0);
{
_x params ["_color", "_startPos", "_projectile", ["_segments", []]];
if (alive _projectile) then {
Expand Down
4 changes: 2 additions & 2 deletions addons/Streamator/Spectator/Marker/fn_collectMarkerData.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if (markerShape _marker == "POLYLINE") then {
[
false,
markerPolyline _marker,
(configfile >> "CfgMarkerColors" >> markerColor _marker >> "color") call BIS_fnc_colorConfigToRGBA
(configFile >> "CfgMarkerColors" >> markerColor _marker >> "color") call BIS_fnc_colorConfigToRGBA
];
} else {
[
Expand All @@ -27,6 +27,6 @@ if (markerShape _marker == "POLYLINE") then {
markerPos _marker,
markerDir _marker,
getText ([(configFile >> "CfgMarkers" >> markerType _marker >> "icon"), (configFile >> "CfgMarkers" >> markerType _marker >> "texture")] select (isText (configFile >> "CfgMarkers" >> markerType _marker >> "texture"))),
(configfile >> "CfgMarkerColors" >> markerColor _marker >> "color") call BIS_fnc_colorConfigToRGBA
(configFile >> "CfgMarkerColors" >> markerColor _marker >> "color") call BIS_fnc_colorConfigToRGBA
];
};
2 changes: 1 addition & 1 deletion addons/Streamator/Spectator/UI/fn_buildFPSUI.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ _ctrlMinimap ctrlAddEventHandler ["Draw", {

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

private _screenCenterWorldPos = _map ctrlMapScreenToWorld [(_mapPosition select 0) + safeZoneWAbs/2, (_mapPosition select 1) + (SafeZoneH - 1.5 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))/2];
private _screenCenterWorldPos = _map ctrlMapScreenToWorld [(_mapPosition select 0) + safeZoneWAbs/2, (_mapPosition select 1) + (safeZoneH - 1.5 *((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25))/2];
_screenCenterWorldPos set [2, 0];
_mapCenterWorldPos set [2, 0];
_position = _position vectorAdd (_screenCenterWorldPos vectorDiff _mapCenterWorldPos);
Expand Down
2 changes: 1 addition & 1 deletion addons/Streamator/Spectator/UI/fn_buildUI.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ private _ctrlPlanningChannel = _display ctrlCreate ["RscStructuredText", -1, _ct
_ctrlPlanningChannel ctrlSetPosition [0, safeZoneH - PY(BORDERWIDTH), safeZoneW , PY(1.8)];
_ctrlPlanningChannel ctrlSetFont "RobotoCondensedBold";
_ctrlPlanningChannel ctrlSetFontHeight PY(2);
_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)];
_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)];
_ctrlPlanningChannel ctrlCommit 0;

[QGVAR(PlanningModeChannelChanged), {
Expand Down
2 changes: 1 addition & 1 deletion addons/Streamator/Spectator/UI/fn_buildUnitInfoUI.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ private _xPosition = 41;
_ctrlMagInfo2 ctrlSetText "99"; //Magazine load
_ctrlMagInfo2 ctrlCommit 0;
_xPosition = _xPosition + 19.5;
_ctrlWeaponSlots pushback [_ctrlGrp, _ctrlWeaponPicture, _ctrlWeaponName, _ctrlMagInfo, _ctrlMagInfo2, _ctrlMagIcon];
_ctrlWeaponSlots pushBack [_ctrlGrp, _ctrlWeaponPicture, _ctrlWeaponName, _ctrlMagInfo, _ctrlMagInfo2, _ctrlMagIcon];
} forEach [
["MX 6.5MM", "\A3\weapons_F\Rifles\MX\data\UI\gear_mx_rifle_X_CA.paa"],
["NLAW","\A3\weapons_f\launchers\nlaw\data\UI\gear_nlaw_ca.paa"],
Expand Down
2 changes: 1 addition & 1 deletion addons/Streamator/Spectator/User/fn_addSearchTarget.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if (isNil QGVAR(CustomSearchItems)) then {
};
private _index = GVAR(CustomSearchItems) findIf {_x select 0 == _name};
if (_index == -1) then {
GVAR(CustomSearchItems) pushback [_name, [_target, _distance, _hight]];
GVAR(CustomSearchItems) pushBack [_name, [_target, _distance, _hight]];
} else {
GVAR(CustomSearchItems) set [_index, [_name, [_target, _distance, _hight]]]
};
2 changes: 1 addition & 1 deletion addons/Streamator/Spectator/User/fn_isSpectator.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
is Spectator <Bool>
*/
params ["_unit"];
(_unit isKindof "VirtualSpectator_F" && side _unit isEqualTo sideLogic)
(_unit isKindOf "VirtualSpectator_F" && side _unit isEqualTo sideLogic)
|| _unit getVariable ["Streamator_isSpectator", false]
2 changes: 1 addition & 1 deletion addons/Streamator/Spectator/fn_clientInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ GVAR(aceAdvancedThrowingLoaded) = isClass (configFile >> "CfgPatches" >> "ace_ad
"initializeSpectator" call CFUNC(localEvent);
};
CLib_Player setVariable [QGVAR(isPlayer), true, true];
CLib_Player addEventhandler ["FiredMan", {
CLib_Player addEventHandler ["FiredMan", {
if (GVAR(Streamators) isEqualTo []) exitWith {};
params ["_unit", "_weapon", "", "", "_ammo", "", "_projectile"];
if (_ammo isKindOf "BombCore") then {
Expand Down
4 changes: 2 additions & 2 deletions addons/Streamator/Spectator/fn_getMousePositionInWorld.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ if (GVAR(useTerrainIntersect)) then {
private _intersectArray = lineIntersectsSurfaces [AGLToASL _startPosition, AGLToASL _endPosition];
if (_intersectArray isNotEqualTo []) then {
(_intersectArray select 0) params ["_intersectPosition"];
_endPosition = ASLtoAGL _intersectPosition;
_endPosition = ASLToAGL _intersectPosition;
};
} else {
private _ti = ASLtoAGL terrainIntersectAtASL [AGLToASL _startPosition, AGLToASL _endPosition];
private _ti = ASLToAGL terrainIntersectAtASL [AGLToASL _startPosition, AGLToASL _endPosition];
if ((_ti distance2D [0,0,0]) > 1) then {
_endPosition = _ti;
};
Expand Down
2 changes: 1 addition & 1 deletion addons/Streamator/Spectator/fn_openSpectator.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ if (GVAR(aceSpectatorLoaded)) then {
}] call CBA_fnc_addEventHandler;
};

if (CLib_Player isKindof "VirtualSpectator_F" && side CLib_Player isEqualTo sideLogic) then {
if (CLib_Player isKindOf "VirtualSpectator_F" && side CLib_Player isEqualTo sideLogic) then {
[_fnc_init, {
(missionNamespace getVariable ["BIS_EGSpectator_initialized", false]) && !isNull findDisplay 60492;
}] call CFUNC(waitUntil);
Expand Down
6 changes: 3 additions & 3 deletions addons/Streamator/Spectator/fn_setVisionMode.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
switch (GVAR(CameraVision)) do {
case (9): {
camUseNVG false;
false setCamUseTi 0;
false setCamUseTI 0;
};
case (8): {
camUseNVG true;
false setCamUseTi 0;
false setCamUseTI 0;
};
default {
camUseNVG false;
true setCamUseTi GVAR(CameraVision);
true setCamUseTI GVAR(CameraVision);
};
};
8 changes: 4 additions & 4 deletions addons/Streamator/Spectator/fn_updatePlanningMarkers.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if (GVAR(PlanningModeDrawing) && { GVAR(InputMode) == INPUTMODE_PLANINGMODE }) t
private _intersectArray = lineIntersectsSurfaces [AGLToASL _cameraPosition, AGLToASL _position, objNull, objNull, true, 1, "GEOM", "NONE", false];
if (_intersectArray isNotEqualTo []) then {
(_intersectArray select 0) params ["_intersectPosition"];
_position = ASLtoAGL _intersectPosition;
_position = ASLToAGL _intersectPosition;
};
};
[_serverTime, _position] call FUNC(updatePlanningCursorPosition);
Expand All @@ -52,16 +52,16 @@ _targets = _targets select {
if (_lastPosition isNotEqualTo _cursorPos) then {
_lastPosition params ["_lasttime", "_lastpos"];
if ((_newtime - _lasttime) < 0.2) then {
_lastpos = AGLtoASL _lastpos;
_newpos = AGLtoASL _newpos;
_lastpos = AGLToASL _lastpos;
_newpos = AGLToASL _newpos;
private _diffpos = _newpos vectorDiff _lastpos;
private _dist = vectorMagnitude _diffpos;
_diffpos = vectorNormalized _diffPos;
private _nSteps = (round (_dist/5) min 20) max 2;
private _tSteps = (_newtime - _lasttime)/_nSteps;
private _sSteps = _dist/_nSteps;
for "_cnt" from 1 to _nSteps do {
_cursorHistory pushBackUnique [_lasttime + _tSteps*_cnt, ASLtoAGL (_lastpos vectorAdd (_diffPos vectorMultiply (_cnt*_sSteps)))];
_cursorHistory pushBackUnique [_lasttime + _tSteps*_cnt, ASLToAGL (_lastpos vectorAdd (_diffPos vectorMultiply (_cnt*_sSteps)))];
};
};
_cursorHistory pushBackUnique _cursorPos;
Expand Down
2 changes: 1 addition & 1 deletion addons/Streamator/Spectator/fn_updateValidUnits.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ _allUnits = _allUnits arrayIntersect _allUnits;
{
private _valid = _x call FUNC(isValidUnit);
_x setVariable [QGVAR(isValidUnit), _valid];
} foreach _allUnits;
} forEach _allUnits;

{
private _uavData = UAVControl _x;
Expand Down
2 changes: 1 addition & 1 deletion addons/Streamator/UnitTracker/fn_addUnitToTracker.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ private _manIcon = ["ICON", _icon, _color, _newUnit, 20, 20, _newUnit, "", 1, 0.
_height = _width;
};

if ((toUpper (lifeState _position)) == "INCAPACITATED") exitWith {
if ((toUpperANSI (lifeState _position)) == "INCAPACITATED") exitWith {
_color = [0.3, 0.3, 0.3, 0.5];
_texture = "\A3\ui_f\data\igui\cfg\revive\overlayicons\u100_ca.paa";
_color = [1, 0, 0, 1];
Expand Down
2 changes: 1 addition & 1 deletion include/tc/CLib
Submodule CLib updated 56 files
+4 −0 .hemtt/lints.toml
+1 −1 .hemtt/project.toml
+1 −1 addons/CLib/3dGraphics/fn_add3dGraphics.sqf
+2 −2 addons/CLib/3dGraphics/fn_draw3dGraphics.sqf
+1 −1 addons/CLib/3dGraphics/fn_remove3dGraphics.sqf
+2 −2 addons/CLib/AnimFramework/fn_getDeathAnimation.sqf
+1 −1 addons/CLib/AnimFramework/fn_getDefaultAnimation.sqf
+1 −1 addons/CLib/ConfigCaching/fn_configProperties.sqf
+1 −1 addons/CLib/ConfigCaching/fn_getConfigDataCached.sqf
+1 −1 addons/CLib/ConfigCaching/fn_returnParents.sqf
+3 −3 addons/CLib/Core/Autoload/fn_callModules.sqf
+1 −1 addons/CLib/Core/Autoload/fn_loadModules.sqf
+1 −1 addons/CLib/Core/Autoload/fn_loadModulesServer.sqf
+2 −2 addons/CLib/Core/Autoload/fn_sendFunctions.sqf
+1 −1 addons/CLib/Core/ClientAddonModuleLoader/fn_postInit.sqf
+2 −2 addons/CLib/Core/Compile/fn_compile.sqf
+1 −1 addons/CLib/Core/Compile/fn_readAllFunctions.sqf
+4 −4 addons/CLib/Core/Compile/fn_readAllModules.sqf
+1 −1 addons/CLib/Core/Misc/fn_cachedCall.sqf
+4 −4 addons/CLib/Core/Misc/fn_compatibleMagazines.sqf
+2 −2 addons/CLib/Core/Misc/fn_disableUserInput.sqf
+12 −12 addons/CLib/Core/Misc/fn_messageBox.sqf
+2 −2 addons/CLib/Core/Misc/fn_modLoaded.sqf
+1 −1 addons/CLib/Core/Misc/fn_moduleLoaded.sqf
+1 −1 addons/CLib/Core/Misc/fn_textTiles.sqf
+1 −1 addons/CLib/Core/MissionModuleLoader/fn_postInit.sqf
+18 −13 addons/CLib/Core/fn_preStart.sqf
+2 −2 addons/CLib/Core/fn_serverInit.sqf
+1 −1 addons/CLib/Events/fn_addEventHandler.sqf
+2 −2 addons/CLib/Events/fn_addIgnoredEventLog.sqf
+2 −2 addons/CLib/Events/fn_init.sqf
+1 −1 addons/CLib/Events/fn_localEvent.sqf
+1 −1 addons/CLib/Events/fn_removeEventhandler.sqf
+1 −1 addons/CLib/Events/fn_targetEvent.sqf
+2 −2 addons/CLib/GarbageCollector/fn_serverInit.sqf
+5 −0 addons/CLib/Gear/Loadout/CfgCLibLoadouts.hpp
+18 −1 addons/CLib/Gear/Loadout/fn_applyLoadout.sqf
+1 −1 addons/CLib/Gear/Loadout/fn_getLoadoutDetails.sqf
+1 −1 addons/CLib/Gear/Loadout/fn_init.sqf
+1 −1 addons/CLib/Gear/Loadout/fn_loadLoadout.sqf
+1 −1 addons/CLib/Gear/fn_addContainer.sqf
+1 −1 addons/CLib/Gear/fn_addItem.sqf
+11 −11 addons/CLib/Interaction/fn_addAction.sqf
+1 −1 addons/CLib/Interaction/fn_clientInitCanInteractWith.sqf
+1 −1 addons/CLib/Interaction/fn_clientInitInteraction.sqf
+1 −1 addons/CLib/Interaction/fn_overrideAction.sqf
+1 −1 addons/CLib/MapGraphics/fn_addMapGraphicsEventHandler.sqf
+1 −1 addons/CLib/MapGraphics/fn_addMapGraphicsGroup.sqf
+3 −3 addons/CLib/MapGraphics/fn_removeMapGraphicsEventHandler.sqf
+1 −1 addons/CLib/MapGraphics/fn_removeMapGraphicsGroup.sqf
+1 −1 addons/CLib/MapGraphics/fn_triggerMapGraphicsEvent.sqf
+1 −1 addons/CLib/Mutex/fn_mutex.sqf
+1 −1 addons/CLib/Notification/fn_clientInitNotification.sqf
+1 −1 addons/CLib/PerFrame/fn_removePerframeHandler.sqf
+1 −1 addons/CLib/PerformanceInfo/fn_dumpPerformanceInfo.sqf
+1 −1 addons/CLib/StatusEffects/fn_setStatusEffect.sqf

0 comments on commit cf0568e

Please sign in to comment.