mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Replace ace_common_fnc_stringRemoveWhiteSpace with CBA_fnc_removeWhitespace (#4222)
* Replace FUNC(stringRemoveWhiteSpace) with CBA_fnc_removeWhitespace, Depreacte ACE's * Use QFUNC * Bump required CBA version * Change remove version to 3.110.0
This commit is contained in:
parent
a5d106c116
commit
8458cb2339
@ -28,7 +28,7 @@ private _whitespaceList = [];
|
|||||||
|
|
||||||
{
|
{
|
||||||
if (_removeWhitespace) then {
|
if (_removeWhitespace) then {
|
||||||
_whitespaceList pushBack ([_x] call FUNC(stringRemoveWhiteSpace));
|
_whitespaceList pushBack ([_x] call CBA_fnc_removeWhitespace);
|
||||||
} else {
|
} else {
|
||||||
_whitespaceList pushBack ([_x] call CBA_fnc_trim);
|
_whitespaceList pushBack ([_x] call CBA_fnc_trim);
|
||||||
};
|
};
|
||||||
|
@ -17,4 +17,6 @@
|
|||||||
|
|
||||||
params ["_string"];
|
params ["_string"];
|
||||||
|
|
||||||
|
ACE_DEPRECATED(QFUNC(stringRemoveWhiteSpace),"3.10.0","CBA_fnc_removeWhitespace");
|
||||||
|
|
||||||
(_string splitString " ") joinString ""
|
(_string splitString " ") joinString ""
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
// MINIMAL required version for the Mod. Components can specify others..
|
// MINIMAL required version for the Mod. Components can specify others..
|
||||||
#define REQUIRED_VERSION 1.62
|
#define REQUIRED_VERSION 1.62
|
||||||
#define REQUIRED_CBA_VERSION {3,0,0}
|
#define REQUIRED_CBA_VERSION {3,1,0}
|
||||||
|
|
||||||
#ifdef COMPONENT_BEAUTIFIED
|
#ifdef COMPONENT_BEAUTIFIED
|
||||||
#define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED)
|
#define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED)
|
||||||
|
@ -36,7 +36,7 @@ if (_activated && local _logic) then {
|
|||||||
_missionRoot = str missionConfigFile select [0, count str missionConfigFile - 15];
|
_missionRoot = str missionConfigFile select [0, count str missionConfigFile - 15];
|
||||||
|
|
||||||
{
|
{
|
||||||
_x = [_x] call EFUNC(common,stringRemoveWhiteSpace);
|
_x = [_x] call CBA_fnc_removeWhitespace;
|
||||||
|
|
||||||
if (isClass (missionConfigFile >> "CfgSounds" >> _x)) then {
|
if (isClass (missionConfigFile >> "CfgSounds" >> _x)) then {
|
||||||
// CfgSounds accepts a leading backslash, but a double backslash
|
// CfgSounds accepts a leading backslash, but a double backslash
|
||||||
|
@ -47,7 +47,7 @@ if (_textures isEqualTo []) exitWith {
|
|||||||
ACE_LOGERROR_1("Failed adding custom tag: %1 - missing textures",_identifier);
|
ACE_LOGERROR_1("Failed adding custom tag: %1 - missing textures",_identifier);
|
||||||
};
|
};
|
||||||
|
|
||||||
_identifier = [_identifier] call EFUNC(common,stringRemoveWhiteSpace);
|
_identifier = [_identifier] call CBA_fnc_removeWhitespace;
|
||||||
_requiredItem = toLower _requiredItem;
|
_requiredItem = toLower _requiredItem;
|
||||||
|
|
||||||
// Add
|
// Add
|
||||||
|
Loading…
Reference in New Issue
Block a user