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

Apply suggestions from code review

Browse Source 
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
This commit is contained in:
Ivanowicz 2023-12-04 19:25:09 +01:00 committed by GitHub
parent b8e93e2d28
commit debeb1bb5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/repair/functions/fnc_doRepair.sqf
View File

@ -50,7 +50,7 @@ if (_hitPointNewDamage < _hitPointCurDamage) then {
_parentHitpointNewDamage = (_parentHitpointCurDamage - 0.5) max _postRepairDamageMin; _parentHitpointNewDamage = (_parentHitpointCurDamage - 0.5) max _postRepairDamageMin;
}; };
_repairedHitpoints pushBack _parentIndex; _repairedHitpoints pushBack _parentIndex;
TRACE_4("Repairing depends and parent", _vehicle, _hitPointIndex, _parentIndex, _parentHitpointNewDamage); TRACE_4("Repairing depends and parent",_vehicle,_hitPointIndex,_parentIndex,_parentHitpointNewDamage);
[QGVAR(setVehicleHitPointDamage), [_vehicle, _parentIndex, _parentHitpointNewDamage], _vehicle] call CBA_fnc_targetEvent; [QGVAR(setVehicleHitPointDamage), [_vehicle, _parentIndex, _parentHitpointNewDamage], _vehicle] call CBA_fnc_targetEvent;
_hitPointCurDamage = _parentHitpointNewDamage; _hitPointCurDamage = _parentHitpointNewDamage;
}; };
@ -76,7 +76,7 @@ if (isArray _hitpointGroupConfig) then {
private _subPointCurDamage = _vehicle getHitIndex _hitPointIndex; private _subPointCurDamage = _vehicle getHitIndex _hitPointIndex;
private _subPointNewDamage = (_subPointCurDamage - 0.5) max _postRepairDamageMin; private _subPointNewDamage = (_subPointCurDamage - 0.5) max _postRepairDamageMin;
if (_subPointNewDamage < _subPointCurDamage) then { if (_subPointNewDamage < _subPointCurDamage) then {
TRACE_3("repairing sub point", _vehicle, _subHitIndex, _subPointNewDamage); TRACE_3("repairing sub point",_vehicle,_subHitIndex,_subPointNewDamage);
_repairedHitpoints pushBack _subHitIndex; _repairedHitpoints pushBack _subHitIndex;
[QGVAR(setVehicleHitPointDamage), [_vehicle, _subHitIndex, _subPointNewDamage], _vehicle] call CBA_fnc_targetEvent; [QGVAR(setVehicleHitPointDamage), [_vehicle, _subHitIndex, _subPointNewDamage], _vehicle] call CBA_fnc_targetEvent;
}; };

4
addons/repair/functions/fnc_getSelectionsToIgnore.sqf
View File

@ -19,7 +19,7 @@ params ["_vehicle"];
private _type = typeOf _vehicle; private _type = typeOf _vehicle;
TRACE_2("getSelectionsToIgnore",_vehicle,_type); TRACE_2("getSelectionsToIgnore",_vehicle,_type);
private _initializedClasses = GETMVAR(GVAR(ignoredAndDependsInitializedClasses), createHashMap); private _initializedClasses = GETMVAR(GVAR(ignoredAndDependsInitializedClasses),createHashMap);
if (_type in _initializedClasses) exitWith { if (_type in _initializedClasses) exitWith {
TRACE_2("retrieved cached selections",_vehicle,_type); TRACE_2("retrieved cached selections",_vehicle,_type);
_initializedClasses get _type; _initializedClasses get _type;
@ -161,6 +161,6 @@ private _processedSelections = [];
} forEach _hitSelections; } forEach _hitSelections;
_initializedClasses set [_type, [_indexesToIgnore, _dependsIndexMap]]; _initializedClasses set [_type, [_indexesToIgnore, _dependsIndexMap]];
SETMVAR(GVAR(ignoredAndDependsInitializedClasses), _initializedClasses); SETMVAR(GVAR(ignoredAndDependsInitializedClasses),_initializedClasses);
[_indexesToIgnore, _dependsIndexMap] [_indexesToIgnore, _dependsIndexMap]

2
addons/repair/functions/fnc_normalizeHitPoints.sqf
View File

@ -26,6 +26,6 @@ if !(local _vehicle) exitWith {ERROR_1("Vehicle Not Local %1", _vehicle);};
// apply normalized damage to all depends hitpoints // apply normalized damage to all depends hitpoints
{ {
private _damage = _vehicle getHitIndex _y; private _damage = _vehicle getHitIndex _y;
TRACE_2("setting depends hitpoint", _x, _damage); TRACE_2("setting depends hitpoint",_x,_damage);
_vehicle setHitIndex [_x, _damage]; _vehicle setHitIndex [_x, _damage];
} forEach _dependsIndexMap; } forEach _dependsIndexMap;

4
addons/repair/functions/fnc_setHitPointDamage.sqf
View File

@ -31,7 +31,7 @@ if !(local _vehicle) exitWith {ERROR_1("Vehicle Not Local %1", _vehicle);};
([_vehicle] call FUNC(getSelectionsToIgnore)) params ["_selectionsToIgnore", "_dependsIndexMap"]; ([_vehicle] call FUNC(getSelectionsToIgnore)) params ["_selectionsToIgnore", "_dependsIndexMap"];
// exit if the hitpoint is not valid // exit if the hitpoint is not valid
if ((_hitPointIndex < 0) || {_hitPointIndex >= (count _hitSelections)}) exitWith {ERROR_2("NOT A VALID HITPOINT: %1-%2", _hitPointIndex,_vehicle);}; if ((_hitPointIndex < 0) || {_hitPointIndex >= (count _hitSelections)}) exitWith {ERROR_2("NOT A VALID HITPOINT: %1-%2",_hitPointIndex,_vehicle);};
// save structural damage and sum of hitpoint damages // save structural damage and sum of hitpoint damages
private _damageOld = damage _vehicle; private _damageOld = damage _vehicle;
@ -40,7 +40,7 @@ private _realHitPointCount = 0;
private _hitPointDamageSumOld = 0; private _hitPointDamageSumOld = 0;
private _hitPointDamageRepaired = 0; //positive for repairs : newSum = (oldSum - repaired) private _hitPointDamageRepaired = 0; //positive for repairs : newSum = (oldSum - repaired)
{ {
if (!(_forEachIndex in _selectionsToIgnore) && isNil{_dependsIndexMap get _forEachIndex}) then { if (!(_forEachIndex in _selectionsToIgnore) && !(_forEachIndex in _dependsIndexMap)) then {
_realHitPointCount = _realHitPointCount + 1; _realHitPointCount = _realHitPointCount + 1;
_hitPointDamageSumOld = _hitPointDamageSumOld + (_damageValues select _forEachIndex); _hitPointDamageSumOld = _hitPointDamageSumOld + (_damageValues select _forEachIndex);
if (_forEachIndex == _hitPointIndex) then { if (_forEachIndex == _hitPointIndex) then {