Merge branch 'hotfix/cba_settings'

genesis92x · Feb 9, 2019 · 5bd93e3 · 5bd93e3
2 parents 02da0ee + e0dea13
commit 5bd93e3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/Vcom/Functions/FFE_Functions/fn_AutoConfig.sqf b/Vcom/Functions/FFE_Functions/fn_AutoConfig.sqf
@@ -117,7 +117,7 @@ params ["_allArty"];
 
 						if ((isText _subAmmo) and {not ((getText _subAmmo) isEqualTo "")}) then
 						{
-							_ammoC = configfile >> "CfgAmmo" >> (getText _subAmmo);
+							_ammoC = configfile >> "CfgAmmo" >> _subAmmo;
 						};
 
 						_actHit = getNumber (_ammoC >> "indirectHit");

diff --git a/Vcom/VcomInit.sqf b/Vcom/VcomInit.sqf
@@ -14,7 +14,7 @@ if (isFilePatchingEnabled && {"" != loadFile "\userconfig\VCOM_AI\AISettingsV4.h
 {
 	[] call compile preprocessFileLineNumbers "\userconfig\VCOM_AI\AISettingsV4.hpp"; //Overwrite with userconfig
 };
-[] call VCM_fnc_CBA_Settings; //Overwrite with CBA settings
+if (isClass (configfile >> "CfgPatches" >> "cba_settings")) then {[] call VCM_fnc_CBA_Settings}; //Overwrite with CBA settings
 
 //Mod checks
 //ACE CHECK

diff --git a/Vcom/changelog.txt b/Vcom/changelog.txt
@@ -3,6 +3,21 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [3.2.1] - 2019-01-31
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+- CBA settings would get called despite CBA not being active
+
+### Security
+
+
 ## [3.2] - 2019-01-20
 ### Added
 - VCOM Driving (Experimental)