Merge branch 'master' into release-3.16.0

CBATeam · Oct 17, 2023 · 5bc60cd · 5bc60cd
2 parents b180281 + 7216efe
commit 5bc60cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/addons/arrays/fnc_selectBest.sqf b/addons/arrays/fnc_selectBest.sqf
@@ -28,7 +28,7 @@ SCRIPT(selectBest);
 
 params ["_array", "_criteria", "_return"];
 
-private _bestScore = -1e99;
+private _bestScore = -1e38;
 {
     private _xScore = _x call _criteria;
     if (_xScore > _bestScore) then {

diff --git a/addons/jam/jam_spe/CfgWeapons.hpp b/addons/jam/jam_spe/CfgWeapons.hpp
@@ -15,7 +15,7 @@ class CfgWeapons {
     };
 
     class SPE_M1_Garand: SPE_RIFLE {
-        magazineWell[] += {"CBA_30Carbine_M1Carbine"};
+        magazineWell[] += {"CBA_3006_Garand"};
     };
 
     class SPE_M1903A3_Springfield: SPE_RIFLE {