Apply suggestions from code review

KillahPotatoes · Mar 14, 2024 · 0ad5bcb · 0ad5bcb
1 parent 1a9dcca
commit 0ad5bcb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 16 deletions.
diff --git a/Missionframework/functions/fn_LAMBS_enableReinforcements.sqf b/Missionframework/functions/fn_LAMBS_enableReinforcements.sqf
@@ -23,5 +23,5 @@ if (isNull _grp) exitwith {
     ["Attempted to set LAMBS Reinforcements on null group.", "ERROR"] remoteExecCall ["KPLIB_fnc_log", 2];
 };
 
-(leader _grp) setVariable ["lambs_danger_dangerRadio", true,true];
+(leader _grp) setVariable ["lambs_danger_dangerRadio", true, true];
 _grp setVariable ["lambs_danger_enableGroupReinforce", true, true];
diff --git a/Missionframework/functions/fn_spawnVehicle.sqf b/Missionframework/functions/fn_spawnVehicle.sqf
@@ -84,15 +84,12 @@ if (_classname in KPLIB_o_militiaVehicles) then {
     private _crew = units (createVehicleCrew _newvehicle);
     _crew joinSilent _grp;
     {
-    _x addEventHandler ["Killed", {
-	params ["_unit", "_killer", "_instigator", "_useEffects"];
-
-     ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent;
-    }];
-
+        _x addMPEventHandler ["MPKilled", {
+            params ["_unit", "_killer"];
+            ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent;
+        }];
     } forEach _crew;
 };
-};
 
 // Add Killed and GetIn EHs and enable damage again
 _newvehicle addMPEventHandler ["MPKilled", {

diff --git a/Missionframework/scripts/server/ai/battlegroup_ai.sqf b/Missionframework/scripts/server/ai/battlegroup_ai.sqf
@@ -15,8 +15,6 @@ private _waypoint = [];
 { deleteWaypoint _x } forEachReversed waypoints _grp;
 {_x doFollow leader _grp} forEach units _grp;
 
-_startpos = getPos (leader _grp);
-
 _waypoint = _grp addWaypoint [_objPos, 100];
 _waypoint setWaypointType "MOVE";
 _waypoint setWaypointSpeed "NORMAL";

diff --git a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf
@@ -32,13 +32,13 @@ if !(_spawn_marker isEqualTo "") then {
 
         for "_i" from 1 to _squadNumber do {
         // Create infantry groups with up to 8 units per squad
-        private _grp = createGroup [kplib_side_enemy, true];
+        private _grp = createGroup [KPLIB_side_enemy, true];
         for "_i" from 0 to 7 do {
             [selectRandom _infClasses, markerPos _spawn_marker, _grp] call KPLIB_fnc_createManagedUnit;
         };
-        [_grp] call KPLIB_fnc_LAMBS_enableReinforcements;
-        [_grp] call battlegroup_ai;
-        _grp setVariable ["KPLIB_isBattleGroup",true];
+            [_grp] call KPLIB_fnc_LAMBS_enableReinforcements;
+            [_grp] call battlegroup_ai;
+            _grp setVariable ["KPLIB_isBattleGroup",true];
         };
     } else {
         private _vehicle_pool = [KPLIB_o_battleGrpVehicles, KPLIB_o_battleGrpVehiclesLight] select (KPLIB_enemyReadiness < 50);
@@ -56,7 +56,7 @@ if !(_spawn_marker isEqualTo "") then {
 
             (crew _vehicle) joinSilent _nextgrp;
             [_nextgrp] call battlegroup_ai;
-            _nextgrp setVariable ["KPLIB_isBattleGroup",true];
+            _nextgrp setVariable ["KPLIB_isBattleGroup", true];
 
             if ((_x in KPLIB_o_troopTransports) && ([] call KPLIB_fnc_getOpforCap < KPLIB_cap_battlegroup)) then {
                 if (_vehicle isKindOf "Air") then {

diff --git a/Missionframework/scripts/server/init_server.sqf b/Missionframework/scripts/server/init_server.sqf
@@ -136,7 +136,7 @@ if (KPLIB_param_restart > 0) then {
 
 ["KPLIB_ResetBattleGroups", {
     {
-        if (_x getVariable ["KPLIB_isBattleGroup",false]) then {
+        if (_x getVariable ["KPLIB_isBattleGroup", false]) then {
             [_x] call battlegroup_ai;
         }
     } foreach allGroups;