From 097506076f9e25feb00ec171944fb10daef544d4 Mon Sep 17 00:00:00 2001 From: Michael Braun Date: Wed, 26 Aug 2015 16:48:55 +0200 Subject: [PATCH] Fixed format usage in macros requiring ARR_# for it to work --- addons/common/XEH_postInit.sqf | 2 +- addons/common/functions/fnc__handleNetEvent.sqf | 8 ++++---- addons/common/functions/fnc__handleRequestSyncedEvent.sqf | 2 +- addons/common/functions/fnc_addToInventory.sqf | 2 +- addons/common/functions/fnc_cachedCall.sqf | 6 +++--- addons/common/functions/fnc_checkFiles.sqf | 4 ++-- addons/common/functions/fnc_doAnimation.sqf | 2 +- addons/common/functions/fnc_executePersistent.sqf | 2 +- addons/common/functions/fnc_filter.sqf | 2 +- addons/common/functions/fnc_getMapGridData.sqf | 8 ++++---- addons/common/functions/fnc_loadSettingsLocalizedText.sqf | 2 +- addons/common/functions/fnc_localEvent.sqf | 8 ++++---- addons/common/functions/fnc_map.sqf | 2 +- addons/common/functions/fnc_moduleCheckPBOs.sqf | 2 +- addons/common/functions/fnc_removeSyncedEventHandler.sqf | 2 +- addons/common/functions/fnc_serverEvent.sqf | 4 ++-- addons/common/functions/fnc_targetEvent.sqf | 4 ++-- addons/common/functions/fnc_unloadPersonLocal.sqf | 4 ++-- addons/disarming/functions/fnc_eventCallerFinish.sqf | 2 +- addons/disarming/functions/fnc_eventTargetFinish.sqf | 2 +- addons/explosives/functions/fnc_placeExplosive.sqf | 4 ++-- addons/frag/functions/fnc_doSpall.sqf | 2 +- addons/frag/functions/fnc_frago.sqf | 2 +- addons/interact_menu/functions/fnc_addActionToClass.sqf | 2 +- .../laserpointer/functions/fnc_switchLaserLightMode.sqf | 2 +- addons/overheating/functions/fnc_cooldown.sqf | 2 +- addons/repair/functions/fnc_addRepairActions.sqf | 2 +- addons/slideshow/functions/fnc_createSlideshow.sqf | 2 +- addons/slideshow/functions/fnc_moduleInit.sqf | 2 +- addons/viewdistance/functions/fnc_initModule.sqf | 2 +- 30 files changed, 46 insertions(+), 46 deletions(-) diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf index 60d1101e6b..97c54945e8 100644 --- a/addons/common/XEH_postInit.sqf +++ b/addons/common/XEH_postInit.sqf @@ -40,7 +40,7 @@ ["HeadbugFixUsed", { PARAMS_2(_profileName,_animation); - ACE_LOGINFO(format ["Headbug Used: Name: %1, Animation: %2", _profileName, _animation]); + ACE_LOGINFO(format [ARR_3("Headbug Used: Name: %1, Animation: %2", _profileName, _animation)]); }] call FUNC(addEventHandler); diff --git a/addons/common/functions/fnc__handleNetEvent.sqf b/addons/common/functions/fnc__handleNetEvent.sqf index 0203b5da0c..516be7c666 100644 --- a/addons/common/functions/fnc__handleNetEvent.sqf +++ b/addons/common/functions/fnc__handleNetEvent.sqf @@ -18,15 +18,15 @@ if (_eventType == "ACEg") then { _events = (GVAR(events) select 1) select _eventIndex; #ifdef DEBUG_EVENTS - ACE_LOGINFO(format ["* Net Event %1", _eventName]); - ACE_LOGINFO(format [" args=%1", _eventArgs]); + ACE_LOGINFO(format [ARR_2("* Net Event %1", _eventName)]); + ACE_LOGINFO(format [ARR_2(" args=%1", _eventArgs)]); #endif { if (!isNil "_x") then { - _eventArgs call CALLSTACK_NAMED(_x, format ["Net Event %1 ID: %2", _eventName, _forEachIndex]); + _eventArgs call CALLSTACK_NAMED(_x, format [ARR_3("Net Event %1 ID: %2", _eventName, _forEachIndex)]); #ifdef DEBUG_EVENTS_CALLSTACK - ACE_LOGINFO(format [" ID: %1", _forEachIndex]); + ACE_LOGINFO(format [ARR_2(" ID: %1", _forEachIndex)]); #endif }; } forEach _events; diff --git a/addons/common/functions/fnc__handleRequestSyncedEvent.sqf b/addons/common/functions/fnc__handleRequestSyncedEvent.sqf index 2a0fd471a0..f94c2c76fe 100644 --- a/addons/common/functions/fnc__handleRequestSyncedEvent.sqf +++ b/addons/common/functions/fnc__handleRequestSyncedEvent.sqf @@ -42,7 +42,7 @@ if(isServer) then { _eventArgs = _x select 1; [_eventName, _eventArgs, (_x select 2)] call FUNC(_handleSyncedEvent); } forEach _eventLog; - ACE_LOGINFO(format ["[%1] synchronized", _eventName]); + ACE_LOGINFO(format [ARR_2("[%1] synchronized", _eventName)]); }; true diff --git a/addons/common/functions/fnc_addToInventory.sqf b/addons/common/functions/fnc_addToInventory.sqf index 0ee8455d70..dec3384dee 100644 --- a/addons/common/functions/fnc_addToInventory.sqf +++ b/addons/common/functions/fnc_addToInventory.sqf @@ -88,7 +88,7 @@ switch ((_type select 0)) do { }; }; default { - ACE_LOGWARNING(format ["Incorrect item type passed to %1, passed: %2", QFUNC(AddToInventory), _type]); + ACE_LOGWARNING(format [ARR_3("Incorrect item type passed to %1, passed: %2",QFUNC(AddToInventory),_type)]); }; }; diff --git a/addons/common/functions/fnc_cachedCall.sqf b/addons/common/functions/fnc_cachedCall.sqf index 2b08d81c05..ad58fb3cb7 100644 --- a/addons/common/functions/fnc_cachedCall.sqf +++ b/addons/common/functions/fnc_cachedCall.sqf @@ -40,7 +40,7 @@ if (((_namespace getVariable [_uid, [-99999]]) select 0) < ACE_diagTime) then { private ["_varName","_cacheList"]; // _eventName is defined on the function that calls the event #ifdef DEBUG_MODE_FULL - ACE_LOGINFO(format ["Clear cached variables on event: %1", _eventName]); + ACE_LOGINFO(format [ARR_2("Clear cached variables on event: %1", _eventName)]); #endif // Get the list of caches to clear _varName = format [QGVAR(clearCache_%1),_eventName]; @@ -58,9 +58,9 @@ if (((_namespace getVariable [_uid, [-99999]]) select 0) < ACE_diagTime) then { _cacheList pushBack [_namespace, _uid]; }; #ifdef DEBUG_MODE_FULL - ACE_LOGINFO(format ["Calculated result: %1 %2", _namespace, _uid]); + ACE_LOGINFO(format [ARR_3("Calculated result: %1 %2", _namespace, _uid)]); } else { - ACE_LOGINFO(format ["Cached result: %1 %2", _namespace, _uid]); + ACE_LOGINFO(format [ARR_3("Cached result: %1 %2", _namespace, _uid)]); #endif }; diff --git a/addons/common/functions/fnc_checkFiles.sqf b/addons/common/functions/fnc_checkFiles.sqf index c6dcff242e..5d29420402 100644 --- a/addons/common/functions/fnc_checkFiles.sqf +++ b/addons/common/functions/fnc_checkFiles.sqf @@ -17,7 +17,7 @@ private "_version"; _version = getText (configFile >> "CfgPatches" >> "ace_main" >> "versionStr"); -ACE_LOGINFO(format ["ACE is version %1.", _version]); +ACE_LOGINFO(format [ARR_2("ACE is version %1.", _version)]); private "_addons"; _addons = activatedAddons; @@ -51,7 +51,7 @@ _addons = [_addons, {_this find "ace_" == 0}] call FUNC(filter); }; } else { // Print the current extension version - ACE_LOGINFO(format ["Extension version: %1: %2", _x, (_x callExtension "version")]); + ACE_LOGINFO(format [ARR_3("Extension version: %1: %2", _x, (_x callExtension "version"))]); }; } forEach getArray (configFile >> "ACE_Extensions" >> "extensions"); diff --git a/addons/common/functions/fnc_doAnimation.sqf b/addons/common/functions/fnc_doAnimation.sqf index 9588460ba1..e3fd5265ba 100644 --- a/addons/common/functions/fnc_doAnimation.sqf +++ b/addons/common/functions/fnc_doAnimation.sqf @@ -23,7 +23,7 @@ _force = False; // no animation given if (isNil "_animation") exitWith { - ACE_LOGERROR(format ["No animation specified in %1.", _fnc_scriptNameParent]); + ACE_LOGERROR(format [ARR_2("No animation specified in %1.", _fnc_scriptNameParent)]); }; if (isNil "_priority") then { diff --git a/addons/common/functions/fnc_executePersistent.sqf b/addons/common/functions/fnc_executePersistent.sqf index af32efb434..1f9da6cd12 100644 --- a/addons/common/functions/fnc_executePersistent.sqf +++ b/addons/common/functions/fnc_executePersistent.sqf @@ -5,7 +5,7 @@ PARAMS_1(_target); { if (isNil "_x") then { - ACE_LOGERROR(format ["No argument and function for remote function. ID: %1", _forEachIndex]); + ACE_LOGERROR(format [ARR_2("No argument and function for remote function. ID: %1", _forEachIndex)]); } else { if (typeName _x == "ARRAY") then { [_x select 0, _target] call (_x select 1); diff --git a/addons/common/functions/fnc_filter.sqf b/addons/common/functions/fnc_filter.sqf index 783a1338e8..06080d046a 100644 --- a/addons/common/functions/fnc_filter.sqf +++ b/addons/common/functions/fnc_filter.sqf @@ -20,7 +20,7 @@ private ["_newArray", "_index"]; PARAMS_2(_array,_code); if (isNil "_array") exitWith { - ACE_LOGERROR(format ["No array for function filter in %1.", _fnc_scriptNameParent]); + ACE_LOGERROR(format [ARR_2("No array for function filter in %1.", _fnc_scriptNameParent)]); [] }; diff --git a/addons/common/functions/fnc_getMapGridData.sqf b/addons/common/functions/fnc_getMapGridData.sqf index c264b6fd50..d831253713 100644 --- a/addons/common/functions/fnc_getMapGridData.sqf +++ b/addons/common/functions/fnc_getMapGridData.sqf @@ -44,7 +44,7 @@ _letterGrid = false; if (((toLower _formatX) find "a") != -1) then {_letterGrid = true}; if (((toLower _formatY) find "a") != -1) then {_letterGrid = true}; if (_letterGrid) exitWith { - ACE_LOGWARNING(format ["Map Grid Warning (%1) - Map uses letter grids [%2, %3]", worldName, _formatX, _formatY]); + ACE_LOGWARNING(format [ARR_4("Map Grid Warning (%1) - Map uses letter grids [%2, %3]", worldName, _formatX, _formatY)]); }; //Start at [0, 500] and move north until we get a change in grid @@ -64,13 +64,13 @@ _stepXat5 = _stepX * 10 ^ ((count _formatX) - 5); _stepYat5 = -1 * _stepY * 10 ^ ((count _formatY) - 5); if (_stepYat5 < 0) then { - ACE_LOGWARNING(format ["Map Grid Warning (%1) - Northing is reversed.", worldName]); + ACE_LOGWARNING(format [ARR_2("Map Grid Warning (%1) - Northing is reversed.", worldName)]); }; if (_stepXat5 != 1) then { - ACE_LOGWARNING(format ["Map Grid Warning (%1) - MGRS 10 digit grid does not equal 1 meter: (%2) for x.", worldName, _stepXat5]); + ACE_LOGWARNING(format [ARR_3("Map Grid Warning (%1) - MGRS 10 digit grid does not equal 1 meter: (%2) for x.", worldName, _stepXat5)]); }; if ((_stepYat5 != 1) && {_stepYat5 != -1}) then { - ACE_LOGWARNING(format ["Map Grid Warning (%1) - MGRS 10 digit grid does not equal 1 meter: (%2) for y.", worldName, _stepXat5]); + ACE_LOGWARNING(format [ARR_3("Map Grid Warning (%1) - MGRS 10 digit grid does not equal 1 meter: (%2) for y.", worldName, _stepXat5)]); }; GVAR(mapGridData) = [_offsetX, _realOffsetY, _stepXat5, _stepYat5]; diff --git a/addons/common/functions/fnc_loadSettingsLocalizedText.sqf b/addons/common/functions/fnc_loadSettingsLocalizedText.sqf index 1d41d2991a..742ed7a6bd 100644 --- a/addons/common/functions/fnc_loadSettingsLocalizedText.sqf +++ b/addons/common/functions/fnc_loadSettingsLocalizedText.sqf @@ -42,7 +42,7 @@ _parseConfigForDisplayNames = { if !([configFile >> "ACE_Settings" >> _name] call _parseConfigForDisplayNames) then { if !([configFile >> "ACE_ServerSettings" >> _name] call _parseConfigForDisplayNames) then { if !([missionConfigFile >> "ACE_Settings" >> _name] call _parseConfigForDisplayNames) then { - ACE_LOGWARNING(format ["Setting found, but couldn't localize [%1] (server has but we don't?)", _name]); + ACE_LOGWARNING(format [ARR_2("Setting found, but couldn't localize [%1] (server has but we don't?)", _name)]); }; }; }; diff --git a/addons/common/functions/fnc_localEvent.sqf b/addons/common/functions/fnc_localEvent.sqf index b6b6bef5a9..88ff3c11aa 100644 --- a/addons/common/functions/fnc_localEvent.sqf +++ b/addons/common/functions/fnc_localEvent.sqf @@ -21,15 +21,15 @@ _eventIndex = _eventNames find _eventName; if(_eventIndex != -1) then { _events = (GVAR(events) select 1) select _eventIndex; #ifdef DEBUG_EVENTS - ACE_LOGINFO(format ["* Local Event: %1", _eventName]); - ACE_LOGINFO(format [" args=%1", _eventArgs]); + ACE_LOGINFO(format [ARR_2("* Local Event: %1", _eventName)]); + ACE_LOGINFO(format [ARR_2(" args=%1", _eventArgs)]); #endif { if(!isNil "_x") then { - _eventArgs call CALLSTACK_NAMED(_x, format ["Local Event %1 ID: %2", _eventName, _forEachIndex]); + _eventArgs call CALLSTACK_NAMED(_x, format [ARR_3("Local Event %1 ID: %2", _eventName, _forEachIndex)]); #ifdef DEBUG_EVENTS_CALLSTACK - ACE_LOGINFO(format [" ID: %1", _forEachIndex]); + ACE_LOGINFO(format [ARR_2(" ID: %1", _forEachIndex)]); #endif }; } forEach _events; diff --git a/addons/common/functions/fnc_map.sqf b/addons/common/functions/fnc_map.sqf index 455a19e2f7..53e5b39fe9 100644 --- a/addons/common/functions/fnc_map.sqf +++ b/addons/common/functions/fnc_map.sqf @@ -21,7 +21,7 @@ _array = + _this select 0; _code = _this select 1; if (isNil "_array") exitWith { - ACE_LOGERROR(format ["No array for function map in %1.", _fnc_scriptNameParent]); + ACE_LOGERROR(format [ARR_2("No array for function map in %1.", _fnc_scriptNameParent)]); [] }; diff --git a/addons/common/functions/fnc_moduleCheckPBOs.sqf b/addons/common/functions/fnc_moduleCheckPBOs.sqf index bc87ff6fc5..496a857698 100644 --- a/addons/common/functions/fnc_moduleCheckPBOs.sqf +++ b/addons/common/functions/fnc_moduleCheckPBOs.sqf @@ -22,4 +22,4 @@ if !(_activated) exitWith {}; [_logic, QGVAR(checkPBOsCheckAll), "CheckAll" ] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(checkPBOsWhitelist), "Whitelist" ] call EFUNC(common,readSettingFromModule); -ACE_LOGINFO(format ["Check-PBOs Module Initialized. Mode: %1.", GVAR(checkPBOsAction)]); +ACE_LOGINFO(format [ARR_2("Check-PBOs Module Initialized. Mode: %1.", GVAR(checkPBOsAction))]); diff --git a/addons/common/functions/fnc_removeSyncedEventHandler.sqf b/addons/common/functions/fnc_removeSyncedEventHandler.sqf index 7202ec00b9..924bb0aa25 100644 --- a/addons/common/functions/fnc_removeSyncedEventHandler.sqf +++ b/addons/common/functions/fnc_removeSyncedEventHandler.sqf @@ -16,7 +16,7 @@ PARAMS_1(_name); private ["_data", "_eventId"]; if (!HASH_HASKEY(GVAR(syncedEvents),_name)) exitWith { - ACE_LOGERROR(format ["Synced event key not found."]); + ACE_LOGERROR("Synced event key not found."); false }; diff --git a/addons/common/functions/fnc_serverEvent.sqf b/addons/common/functions/fnc_serverEvent.sqf index f3118c481b..6bc056dd6f 100644 --- a/addons/common/functions/fnc_serverEvent.sqf +++ b/addons/common/functions/fnc_serverEvent.sqf @@ -16,8 +16,8 @@ PARAMS_2(_eventName,_eventArgs); #ifdef DEBUG_EVENTS - ACE_LOGINFO(format ["* Server Event: %1", _eventName]); - ACE_LOGINFO(format [" args=%1", _eventArgs]); + ACE_LOGINFO(format [ARR_2("* Server Event: %1", _eventName)]); + ACE_LOGINFO(format [ARR_2(" args=%1", _eventArgs)]); #endif ACEg = [_eventName, _eventArgs]; diff --git a/addons/common/functions/fnc_targetEvent.sqf b/addons/common/functions/fnc_targetEvent.sqf index 1e4fed1a4e..3653cc4669 100644 --- a/addons/common/functions/fnc_targetEvent.sqf +++ b/addons/common/functions/fnc_targetEvent.sqf @@ -21,8 +21,8 @@ PARAMS_3(_eventName,_eventTargets,_eventArgs); #ifdef DEBUG_EVENTS - ACE_LOGINFO(format ["* Target Event: %1 - %2", _eventName, _eventTargets]); - ACE_LOGINFO(format [" args=%1", _eventArgs]); + ACE_LOGINFO(format [ARR_3("* Target Event: %1 - %2", _eventName, _eventTargets)]); + ACE_LOGINFO(format [ARR_2(" args=%1", _eventArgs)]); #endif ACEc = [_eventName, _eventTargets, _eventArgs]; diff --git a/addons/common/functions/fnc_unloadPersonLocal.sqf b/addons/common/functions/fnc_unloadPersonLocal.sqf index fadb276670..49646fa38a 100644 --- a/addons/common/functions/fnc_unloadPersonLocal.sqf +++ b/addons/common/functions/fnc_unloadPersonLocal.sqf @@ -38,12 +38,12 @@ if (_vehicle isKindOf "Ship" ) then { TRACE_1("getPosASL Vehicle Check", getPosASL _vehicle); if (!_validVehiclestate) exitwith { - ACE_LOGWARNING(format ["Unable to unload patient because invalid (%1) vehicle state. Either moving or Not close enough on the ground. position: %2 isTouchingGround: %3 Speed: %4", _vehicle, getPos _vehicle, isTouchingGround _vehicle, speed _vehicle]); + ACE_LOGWARNING(format [ARR_5("Unable to unload patient because invalid (%1) vehicle state. Either moving or Not close enough on the ground. position: %2 isTouchingGround: %3 Speed: %4", _vehicle, getPos _vehicle, isTouchingGround _vehicle, speed _vehicle)]); false }; if (count _emptyPos == 0) exitwith { - ACE_LOGWARNING(format ["No safe empty spots to unload patient. %1", _emptyPos]); + ACE_LOGWARNING(format [ARR_2("No safe empty spots to unload patient. %1", _emptyPos)]); false }; //consider displaying text saying there are no safe places to exit the vehicle diff --git a/addons/disarming/functions/fnc_eventCallerFinish.sqf b/addons/disarming/functions/fnc_eventCallerFinish.sqf index 7f270173e8..13e4e50921 100644 --- a/addons/disarming/functions/fnc_eventCallerFinish.sqf +++ b/addons/disarming/functions/fnc_eventCallerFinish.sqf @@ -23,4 +23,4 @@ params ["_caller", "_target", "_errorMsg"]; if (_caller != ACE_player) exitWith {}; systemChat format ["Debug-Caller: Disarm finished from [%1] with code [%2]", _target, _errorMsg]; -ACE_LOGINFO(format ["%1 - eventCallerFinish: %2", ACE_time, _this]); +ACE_LOGINFO(format [ARR_3("%1 - eventCallerFinish: %2", ACE_time, _this)]); diff --git a/addons/disarming/functions/fnc_eventTargetFinish.sqf b/addons/disarming/functions/fnc_eventTargetFinish.sqf index a43592def1..a887eb8092 100644 --- a/addons/disarming/functions/fnc_eventTargetFinish.sqf +++ b/addons/disarming/functions/fnc_eventTargetFinish.sqf @@ -22,6 +22,6 @@ params ["_caller", "_target", "_errorMsg"]; if (_errorMsg != "") then { - ACE_LOGINFO(format ["%1 - eventTargetFinish: %2", ACE_time, _this]); + ACE_LOGINFO(format [ARR_3("%1 - eventTargetFinish: %2", ACE_time, _this)]); ["DisarmDebugCallback", [_caller], [_caller, _target, _errorMsg]] call EFUNC(common,targetEvent); }; diff --git a/addons/explosives/functions/fnc_placeExplosive.sqf b/addons/explosives/functions/fnc_placeExplosive.sqf index d414c40a6d..40ca6a3900 100644 --- a/addons/explosives/functions/fnc_placeExplosive.sqf +++ b/addons/explosives/functions/fnc_placeExplosive.sqf @@ -36,7 +36,7 @@ if (!isNull _setupPlaceholderObject) then { }; if (isNil "_triggerConfig") exitWith { - ACE_LOGERROR(format ["Config not passed to PlaceExplosive: %1", _this]); + ACE_LOGERROR(format [ARR_2("Config not passed to PlaceExplosive: %1",_this)]); objNull }; @@ -44,7 +44,7 @@ _magazineTrigger = ConfigFile >> "CfgMagazines" >> _magazineClass >> "ACE_Trigge _triggerConfig = ConfigFile >> "ACE_Triggers" >> _triggerConfig; if (isNil "_triggerConfig") exitWith { - ACE_LOGERROR(format ["Config not found in PlaceExplosive: %1", _this]); + ACE_LOGERROR(format [ARR_2("Config not found in PlaceExplosive: %1",_this)]); objNull }; diff --git a/addons/frag/functions/fnc_doSpall.sqf b/addons/frag/functions/fnc_doSpall.sqf index 3f9a4834d1..1f6b813a8a 100644 --- a/addons/frag/functions/fnc_doSpall.sqf +++ b/addons/frag/functions/fnc_doSpall.sqf @@ -86,7 +86,7 @@ if(_alive || {_caliber >= 2.5} || {(_explosive > 0 && {_idh >= 1})}) then { if(_gC == 0) then { _gC = 2440; _warn = true;}; if(_warn) then { - ACE_LOGWARNING(format ["Ammo class %1 lacks proper explosive properties definitions for frag!", _roundType]); //TODO: turn this off when we get closer to release + ACE_LOGWARNING(format [ARR_2("Ammo class %1 lacks proper explosive properties definitions for frag!", _roundType)]); //TODO: turn this off when we get closer to release }; _fragPower = (((_m/_c)+_k)^-(1/2))*_gC; diff --git a/addons/frag/functions/fnc_frago.sqf b/addons/frag/functions/fnc_frago.sqf index e775b423cf..15ffe4d97d 100644 --- a/addons/frag/functions/fnc_frago.sqf +++ b/addons/frag/functions/fnc_frago.sqf @@ -67,7 +67,7 @@ _gC = getNumber(configFile >> "CfgAmmo" >> _shellType >> "ACE_frag_GURNEY_C"); if(_gC == 0) then { _gC = 2440; _warn = true;}; if(_warn) then { - ACE_LOGWARNING(format ["Ammo class %1 lacks proper explosive properties definitions for frag!", _shellType]); //TODO: turn this off when we get closer to release + ACE_LOGWARNING(format [ARR_2("Ammo class %1 lacks proper explosive properties definitions for frag!", _shellType)]); //TODO: turn this off when we get closer to release }; _fragPower = (((_m/_c)+_k)^-(1/2))*_gC; diff --git a/addons/interact_menu/functions/fnc_addActionToClass.sqf b/addons/interact_menu/functions/fnc_addActionToClass.sqf index 5befbd8427..55b300fe7f 100644 --- a/addons/interact_menu/functions/fnc_addActionToClass.sqf +++ b/addons/interact_menu/functions/fnc_addActionToClass.sqf @@ -44,7 +44,7 @@ if (_parentPath isEqualTo ["ACE_MainActions"]) then { _parentNode = [_actionTrees, _parentPath] call FUNC(findActionNode); if (isNil {_parentNode}) exitWith { ERROR("Failed to add action"); - ACE_LOGERROR(format ["action (%1) to parent %2 on object %3 [%4]", (_action select 0), _parentPath, _objectType, _typeNum]); + ACE_LOGERROR(format [ARR_5("action (%1) to parent %2 on object %3 [%4]", (_action select 0), _parentPath, _objectType, _typeNum)]); }; // Add action node as children of the correct node of action tree diff --git a/addons/laserpointer/functions/fnc_switchLaserLightMode.sqf b/addons/laserpointer/functions/fnc_switchLaserLightMode.sqf index d52cb1237c..4b1b45b75c 100644 --- a/addons/laserpointer/functions/fnc_switchLaserLightMode.sqf +++ b/addons/laserpointer/functions/fnc_switchLaserLightMode.sqf @@ -84,6 +84,6 @@ switch (_currentWeaponType) do { if (!_error) then { [_description, _picture] call EFUNC(common,displayTextPicture); } else { - ACE_LOGERROR(format ["Failed to add %1 to %2 - reverting to %3", _nextPointer, _weapon, _pointer]); + ACE_LOGERROR(format [ARR_4("Failed to add %1 to %2 - reverting to %3", _nextPointer, _weapon, _pointer)]); }; playSound "ACE_Sound_Click"; diff --git a/addons/overheating/functions/fnc_cooldown.sqf b/addons/overheating/functions/fnc_cooldown.sqf index 0a6f93ee0f..934c9a0abc 100644 --- a/addons/overheating/functions/fnc_cooldown.sqf +++ b/addons/overheating/functions/fnc_cooldown.sqf @@ -39,7 +39,7 @@ while {true} do { if (_temperature < 1) exitWith {0}; if (isNil "_temperature") exitWith { - ACE_LOGERROR(format ["_totalTime = %1; _time = %2; _deltaTime = %3;", _totalTime, _time, _deltaTime]); + ACE_LOGERROR(format [ARR_4("_totalTime = %1; _time = %2; _deltaTime = %3;", _totalTime, _time, _deltaTime)]); 0 }; diff --git a/addons/repair/functions/fnc_addRepairActions.sqf b/addons/repair/functions/fnc_addRepairActions.sqf index 88f038e447..a6ecde45a9 100644 --- a/addons/repair/functions/fnc_addRepairActions.sqf +++ b/addons/repair/functions/fnc_addRepairActions.sqf @@ -110,7 +110,7 @@ if (_type in _initializedClasses) exitWith {}; if (typeName _position == "STRING") exitWith { _selection = _vehicle selectionPosition _position; // Selection name }; - ACE_LOGERROR(format ["Invalid custom position %1 of hitpoint %2 in vehicle %3.", _position, _hitpoint, _vehicle]); + ACE_LOGERROR(format [ARR_4("Invalid custom position %1 of hitpoint %2 in vehicle %3.", _position, _hitpoint, _vehicle)]); }; } forEach (getArray _customSelectionsConfig); }; diff --git a/addons/slideshow/functions/fnc_createSlideshow.sqf b/addons/slideshow/functions/fnc_createSlideshow.sqf index 5c91a3fa10..96089dc986 100644 --- a/addons/slideshow/functions/fnc_createSlideshow.sqf +++ b/addons/slideshow/functions/fnc_createSlideshow.sqf @@ -56,7 +56,7 @@ _currentSlideshow = GVAR(slideshows); // Local variable in case GVAR gets change // If interaction menu module is not present, set default duration value if !(["ace_interact_menu"] call EFUNC(common,isModLoaded)) then { _duration = 5; - ACE_LOGINFO(format ["Interaction Menu module not present, defaulting duration value to %1", _duration]); + ACE_LOGINFO(format [ARR_2("Interaction Menu module not present, defaulting duration value to %1", _duration)]); }; // Add interactions if automatic transitions are disabled, else setup automatic transitions diff --git a/addons/slideshow/functions/fnc_moduleInit.sqf b/addons/slideshow/functions/fnc_moduleInit.sqf index e887e58915..0e205a7530 100644 --- a/addons/slideshow/functions/fnc_moduleInit.sqf +++ b/addons/slideshow/functions/fnc_moduleInit.sqf @@ -34,4 +34,4 @@ _duration = _logic getVariable ["Duration", 0]; // Prepare with actions [_objects, _controllers, _images, _names, _duration] call FUNC(createSlideshow); -ACE_LOGINFO(format ["Slideshow Module Initialized for: %1 with Duration: %2", _objects, _duration]); +ACE_LOGINFO(format [ARR_3("Slideshow Module Initialized for: %1 with Duration: %2", _objects, _duration)]); diff --git a/addons/viewdistance/functions/fnc_initModule.sqf b/addons/viewdistance/functions/fnc_initModule.sqf index 3150d56908..948fd56ef1 100644 --- a/addons/viewdistance/functions/fnc_initModule.sqf +++ b/addons/viewdistance/functions/fnc_initModule.sqf @@ -26,4 +26,4 @@ if (!_activated) exitWith { [_logic, QGVAR(enabled),"moduleViewDistanceEnabled"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(limitViewDistance),"moduleViewDistanceLimit"] call EFUNC(common,readSettingFromModule); -ACE_LOGINFO(format ["View Distance Limit Module Initialized. Limit set by module: %1", GVAR(limitViewDistance)]); +ACE_LOGINFO(format [ARR_2("View Distance Limit Module Initialized. Limit set by module: %1", GVAR(limitViewDistance))]);