From d60d5fe1f3c2330abfc84b22a19edbbabbd5b78c Mon Sep 17 00:00:00 2001 From: SzwedzikPL Date: Sat, 18 Jul 2015 06:47:13 +0200 Subject: [PATCH 01/35] disable a10 tracers, commanche tracers only nvg --- addons/aircraft/CfgAmmo.hpp | 2 +- addons/aircraft/CfgMagazines.hpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index 8aa5d3173e..867b247a5a 100644 --- a/addons/aircraft/CfgAmmo.hpp +++ b/addons/aircraft/CfgAmmo.hpp @@ -11,7 +11,7 @@ class CfgAmmo { explosive = 1.8; tracersEvery = 3; tracerEndTime = 3.5; - + nvgOnly = 1; CraterEffects = "ExploAmmoCrater"; explosionEffects = "ExploAmmoExplosion"; model = "\A3\Weapons_f\Data\bullettracer\tracer_red"; diff --git a/addons/aircraft/CfgMagazines.hpp b/addons/aircraft/CfgMagazines.hpp index b09bac6943..11704056d1 100644 --- a/addons/aircraft/CfgMagazines.hpp +++ b/addons/aircraft/CfgMagazines.hpp @@ -5,6 +5,7 @@ class CfgMagazines { class 1000Rnd_Gatling_30mm_Plane_CAS_01_F: VehicleMagazine { ammo = "ACE_Gatling_30mm_HE_Plane_CAS_01_Deploy"; count = 1170; + tracersEvery = 0; }; // an extended magazine for the comanche From 9e10aa86d7fe98e9b3184bf09d6e20b489feb0ce Mon Sep 17 00:00:00 2001 From: Michael Braun Date: Wed, 26 Aug 2015 15:20:11 +0200 Subject: [PATCH 02/35] Standardize logging format through ACE_LOG macros --- addons/cargo/functions/fnc_moduleSettings.sqf | 2 +- addons/common/XEH_postInit.sqf | 14 +++++++------- .../common/functions/fnc__handleNetEvent.sqf | 18 +++++++++--------- .../fnc__handleRequestSyncedEvent.sqf | 16 ++++++++-------- .../functions/fnc__handleSyncedEvent.sqf | 8 ++++---- .../functions/fnc_addSyncedEventHandler.sqf | 8 ++++---- addons/common/functions/fnc_addToInventory.sqf | 4 +++- addons/common/functions/fnc_cachedCall.sqf | 6 +++--- addons/common/functions/fnc_checkFiles.sqf | 16 ++++++++-------- addons/common/functions/fnc_checkPBOs.sqf | 2 +- addons/common/functions/fnc_claim.sqf | 4 ++-- addons/common/functions/fnc_debug.sqf | 2 +- addons/common/functions/fnc_doAnimation.sqf | 2 +- .../common/functions/fnc_executePersistent.sqf | 2 +- addons/common/functions/fnc_filter.sqf | 2 +- addons/common/functions/fnc_getMapGridData.sqf | 8 ++++---- .../fnc_loadSettingsLocalizedText.sqf | 2 +- addons/common/functions/fnc_localEvent.sqf | 12 ++++++------ addons/common/functions/fnc_map.sqf | 2 +- .../common/functions/fnc_moduleCheckPBOs.sqf | 2 +- .../common/functions/fnc_moduleLSDVehicles.sqf | 2 +- .../functions/fnc_readSettingFromModule.sqf | 2 +- .../functions/fnc_removeSyncedEventHandler.sqf | 6 +++--- addons/common/functions/fnc_serverEvent.sqf | 4 ++-- addons/common/functions/fnc_syncedEvent.sqf | 6 +++--- addons/common/functions/fnc_targetEvent.sqf | 6 +++--- .../common/functions/fnc_unloadPersonLocal.sqf | 14 +++++++++----- .../functions/fnc_eventCallerFinish.sqf | 2 +- .../functions/fnc_eventTargetFinish.sqf | 2 +- addons/explosives/functions/fnc_module.sqf | 2 +- .../functions/fnc_placeExplosive.sqf | 4 ++-- addons/frag/functions/fnc_doSpall.sqf | 4 ++-- addons/frag/functions/fnc_frago.sqf | 10 +++++----- addons/hearing/functions/fnc_moduleHearing.sqf | 2 +- .../functions/fnc_addActionToClass.sqf | 2 +- .../functions/fnc_moduleInteraction.sqf | 2 +- .../functions/fnc_drawVisibleLaserTargets.sqf | 10 +++++----- .../functions/fnc_switchLaserLightMode.sqf | 2 +- .../functions/fnc_blueForceTrackingModule.sqf | 2 +- addons/map/functions/fnc_moduleMap.sqf | 2 +- .../functions/fnc_handleMouseZChanged.sqf | 2 -- addons/medical/XEH_postInit.sqf | 2 +- .../nametags/functions/fnc_initIsSpeaking.sqf | 4 ++-- .../nametags/functions/fnc_moduleNameTags.sqf | 2 +- addons/overheating/functions/fnc_cooldown.sqf | 2 +- addons/reload/XEH_postInit.sqf | 4 ---- .../repair/functions/fnc_addRepairActions.sqf | 2 +- .../functions/fnc_moduleRepairSettings.sqf | 2 +- .../respawn/functions/fnc_initRallypoint.sqf | 14 +++++++------- addons/respawn/functions/fnc_module.sqf | 4 ++-- .../functions/fnc_moduleFriendlyFire.sqf | 12 ++++++------ .../respawn/functions/fnc_moduleRallypoint.sqf | 10 +++++----- addons/sitting/functions/fnc_moduleInit.sqf | 2 +- .../functions/fnc_createSlideshow.sqf | 4 ++-- addons/slideshow/functions/fnc_moduleInit.sqf | 2 +- addons/switchunits/functions/fnc_module.sqf | 2 +- .../viewdistance/functions/fnc_initModule.sqf | 4 ++-- 57 files changed, 146 insertions(+), 146 deletions(-) diff --git a/addons/cargo/functions/fnc_moduleSettings.sqf b/addons/cargo/functions/fnc_moduleSettings.sqf index 35e6aede7a..2027fb4bbb 100644 --- a/addons/cargo/functions/fnc_moduleSettings.sqf +++ b/addons/cargo/functions/fnc_moduleSettings.sqf @@ -25,4 +25,4 @@ if (!_activated) exitWith {}; [_logic, QGVAR(enable), "enable"] call EFUNC(common,readSettingFromModule); -diag_log text "[ACE]: Cargo Module Initialized."; +ACE_LOGINFO("Cargo Module Initialized."); diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf index 6535b79257..60d1101e6b 100644 --- a/addons/common/XEH_postInit.sqf +++ b/addons/common/XEH_postInit.sqf @@ -40,7 +40,7 @@ ["HeadbugFixUsed", { PARAMS_2(_profileName,_animation); - diag_log text format ["[ACE] Headbug Used: Name: %1, Animation: %2", _profileName, _animation]; + ACE_LOGINFO(format ["Headbug Used: Name: %1, Animation: %2", _profileName, _animation]); }] call FUNC(addEventHandler); @@ -100,7 +100,7 @@ if (_currentVersion != _previousVersion) then { // Handle JIP scenario if(!isServer) then { ["PlayerJip", { - diag_log text format["[ACE] * JIP event synchronization initialized"]; + ACE_LOGINFO("JIP event synchronization initialized"); ["SEH_all", [player]] call FUNC(serverEvent); }] call FUNC(addEventHandler); } else { @@ -126,13 +126,13 @@ call FUNC(checkFiles); if (isNil QGVAR(settings) || {(!isServer) && (isNil QEGVAR(modules,serverModulesRead))}) exitWith { if (!_waitingMsgSent) then { _args set [0, true]; - diag_log text format["[ACE] Waiting on settings from server"]; + ACE_LOGINFO("Waiting on settings from server..."); }; }; [(_this select 1)] call cba_fnc_removePerFrameHandler; - diag_log text format["[ACE] Settings received from server"]; + ACE_LOGINFO("Settings received from server."); // Event so that ACE_Modules have their settings loaded: ["InitSettingsFromModules", []] call FUNC(localEvent); @@ -143,7 +143,7 @@ call FUNC(checkFiles); call FUNC(loadSettingsLocalizedText); }; - diag_log text format["[ACE] Settings initialized"]; + ACE_LOGINFO("Settings initialized."); //Event that settings are safe to use: ["SettingsInitialized", []] call FUNC(localEvent); @@ -272,7 +272,7 @@ GVAR(OldVisibleMap) = false; GVAR(OldPlayerWeapon) = _newPlayerWeapon; ["playerWeaponChanged", [ACE_player, _newPlayerWeapon]] call FUNC(localEvent); }; - + // "visibleMapChanged" event _newVisibleMap = visibleMap; if (!_newVisibleMap isEqualTo GVAR(OldVisibleMap)) then { @@ -280,7 +280,7 @@ GVAR(OldVisibleMap) = false; GVAR(OldVisibleMap) = _newVisibleMap; ["visibleMapChanged", [ACE_player, _newVisibleMap]] call FUNC(localEvent); }; - + }, 0, []] call CBA_fnc_addPerFrameHandler; diff --git a/addons/common/functions/fnc__handleNetEvent.sqf b/addons/common/functions/fnc__handleNetEvent.sqf index 7ee1f9c502..0203b5da0c 100644 --- a/addons/common/functions/fnc__handleNetEvent.sqf +++ b/addons/common/functions/fnc__handleNetEvent.sqf @@ -11,22 +11,22 @@ PARAMS_2(_eventType,_event); if (_eventType == "ACEg") then { _eventName = _event select 0; _eventArgs = _event select 1; - + _eventNames = GVAR(events) select 0; _eventIndex = _eventNames find _eventName; if (_eventIndex != -1) then { _events = (GVAR(events) select 1) select _eventIndex; - + #ifdef DEBUG_EVENTS - diag_log text format[ARR_2("* Net Event %1",_eventName)]; - diag_log text format[ARR_2(" args=%1",_eventArgs)]; + ACE_LOGINFO(format ["* Net Event %1", _eventName]); + ACE_LOGINFO(format [" args=%1", _eventArgs]); #endif - + { if (!isNil "_x") then { - _eventArgs call CALLSTACK_NAMED(_x, format[ARR_3("Net Event %1 ID: %2",_eventName,_forEachIndex)]); + _eventArgs call CALLSTACK_NAMED(_x, format ["Net Event %1 ID: %2", _eventName, _forEachIndex]); #ifdef DEBUG_EVENTS_CALLSTACK - diag_log text format[ARR_2(" ID: %1",_forEachIndex)]; + ACE_LOGINFO(format [" ID: %1", _forEachIndex]); #endif }; } forEach _events; @@ -38,7 +38,7 @@ if (_eventType == "ACEc") then { _eventName = _event select 0; _eventTargets = _event select 1; _eventArgs = _event select 2; - + _sentEvents = []; if (!IS_ARRAY(_eventTargets)) then { _eventTargets = [_eventTargets]; @@ -72,4 +72,4 @@ if (_eventType == "ACEc") then { }; } forEach _eventTargets; }; -}; \ No newline at end of file +}; diff --git a/addons/common/functions/fnc__handleRequestSyncedEvent.sqf b/addons/common/functions/fnc__handleRequestSyncedEvent.sqf index fe05bc498b..2a0fd471a0 100644 --- a/addons/common/functions/fnc__handleRequestSyncedEvent.sqf +++ b/addons/common/functions/fnc__handleRequestSyncedEvent.sqf @@ -1,16 +1,16 @@ /* * Author: jaynus - * + * * Receives either requests for synchronization from clients, or the synchronization data from the server. * * Arguments [Client] : * 0: eventName (String) * 1: eventLog (Array) - * + * * Arguments [Server] : * 0: eventName (String) * 1: client (Object) - * + * * Return value: * Boolean of success */ @@ -24,14 +24,14 @@ if(isServer) then { // Find the event name, and shovel out the events to the client PARAMS_2(_eventName,_client); private["_eventEntry", "_eventLog"]; - + if(!HASH_HASKEY(GVAR(syncedEvents),_eventName)) exitWith { - diag_log text format["[ACE] Error, request for synced event - key not found."]; + ACE_LOGERROR("Request for synced event - key not found."); false }; _eventEntry = HASH_GET(GVAR(syncedEvents),_eventName); _eventLog = _eventEntry select 1; - + ["SEH_s", _client, [_eventName, _eventLog] ] call FUNC(targetEvent); } else { PARAMS_2(_eventName,_eventLog); @@ -42,7 +42,7 @@ if(isServer) then { _eventArgs = _x select 1; [_eventName, _eventArgs, (_x select 2)] call FUNC(_handleSyncedEvent); } forEach _eventLog; - diag_log text format["[ACE] + [%1] synchronized", _eventName]; + ACE_LOGINFO(format ["[%1] synchronized", _eventName]); }; -true \ No newline at end of file +true diff --git a/addons/common/functions/fnc__handleSyncedEvent.sqf b/addons/common/functions/fnc__handleSyncedEvent.sqf index 053ecb60b7..aaa6fbdaff 100644 --- a/addons/common/functions/fnc__handleSyncedEvent.sqf +++ b/addons/common/functions/fnc__handleSyncedEvent.sqf @@ -1,13 +1,13 @@ /* * Author: jaynus - * + * * Handles synced events being received. Server will log them, and server/client will execute them. * * Arguments [Client] : * 0: eventName (String) * 1: arguments (Array) * 2: ttl (Scalar) - * + * * Return value: * Boolean of success */ @@ -17,7 +17,7 @@ PARAMS_3(_name,_args,_ttl); private["_internalData", "_eventLog", "_eventCode"]; if(!HASH_HASKEY(GVAR(syncedEvents),_name)) exitWith { - diag_log text format["[ACE] Error, synced event key not found."]; + ACE_LOGERROR("Synced event key not found."); false }; @@ -33,4 +33,4 @@ if(isServer) then { }; _eventCode = _internalData select 0; -_args call _eventCode; \ No newline at end of file +_args call _eventCode; diff --git a/addons/common/functions/fnc_addSyncedEventHandler.sqf b/addons/common/functions/fnc_addSyncedEventHandler.sqf index 60c90672ef..7225a45e59 100644 --- a/addons/common/functions/fnc_addSyncedEventHandler.sqf +++ b/addons/common/functions/fnc_addSyncedEventHandler.sqf @@ -5,9 +5,9 @@ * * Argument: * 0: Name (String) - * 1: Handler (Code) + * 1: Handler (Code) * 2: TTL (Number or Code) [Optional] - * + * * Return value: * Boolean of success */ @@ -25,10 +25,10 @@ if( (count _this) > 2) then { }; if(HASH_HASKEY(GVAR(syncedEvents),_name)) exitWith { - diag_log text format["[ACE] Error, duplicate synced event creation."]; + ACE_LOGERROR("Duplicate synced event creation."); false }; _eventId = [_name, FUNC(_handleSyncedEvent)] call FUNC(addEventHandler); _data = [_handler,[],_ttl,_eventId]; -HASH_SET(GVAR(syncedEvents),_name,_data); \ No newline at end of file +HASH_SET(GVAR(syncedEvents),_name,_data); diff --git a/addons/common/functions/fnc_addToInventory.sqf b/addons/common/functions/fnc_addToInventory.sqf index ba76831ba4..0ee8455d70 100644 --- a/addons/common/functions/fnc_addToInventory.sqf +++ b/addons/common/functions/fnc_addToInventory.sqf @@ -87,7 +87,9 @@ switch ((_type select 0)) do { _unit setPosATL _pos; }; }; - default {diag_log format ["ACE: Incorrect item type passed to %1, passed: %2",QFUNC(AddToInventory),_type];}; + default { + ACE_LOGWARNING(format ["Incorrect item type passed to %1, passed: %2", QFUNC(AddToInventory), _type]); + }; }; [_addedToPlayer,_unit] diff --git a/addons/common/functions/fnc_cachedCall.sqf b/addons/common/functions/fnc_cachedCall.sqf index f9d9c74dd3..2b08d81c05 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 - diag_log text format ["ACE: Clear cached variables on event: %1", _eventName]; + ACE_LOGINFO(format ["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 - diag_log format ["Calculated result: %1 %2", _namespace, _uid]; + ACE_LOGINFO(format ["Calculated result: %1 %2", _namespace, _uid]); } else { - diag_log format ["Cached result : %1 %2", _namespace, _uid]; + ACE_LOGINFO(format ["Cached result: %1 %2", _namespace, _uid]); #endif }; diff --git a/addons/common/functions/fnc_checkFiles.sqf b/addons/common/functions/fnc_checkFiles.sqf index 647a1b00a6..c6dcff242e 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"); -diag_log text format ["[ACE]: ACE is version %1.", _version]; +ACE_LOGINFO(format ["ACE is version %1.", _version]); private "_addons"; _addons = activatedAddons; @@ -28,7 +28,7 @@ _addons = [_addons, {_this find "ace_" == 0}] call FUNC(filter); private "_errorMsg"; _errorMsg = format ["File %1.pbo is outdated.", _x]; - diag_log text format ["[ACE] ERROR: %1", _errorMsg]; + ACE_LOGERROR(_errorMsg); if (hasInterface) then { ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage); @@ -44,14 +44,14 @@ _addons = [_addons, {_this find "ace_" == 0}] call FUNC(filter); private "_errorMsg"; _errorMsg = format ["Extension %1.dll not installed.", _x]; - diag_log text format ["[ACE] ERROR: %1", _errorMsg]; + ACE_LOGERROR(_errorMsg); if (hasInterface) then { ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage); }; } else { // Print the current extension version - diag_log text format ["[ACE] Extension version: %1: %2", _x, (_x callExtension "version")]; + ACE_LOGINFO(format ["Extension version: %1: %2", _x, (_x callExtension "version")]); }; } forEach getArray (configFile >> "ACE_Extensions" >> "extensions"); @@ -78,9 +78,9 @@ if (isMultiplayer) then { private "_errorMsg"; _errorMsg = format ["Client/Server Version Mismatch. Server: %1, Client: %2.", GVAR(ServerVersion), _version]; - diag_log text format ["[ACE] ERROR: %1", _errorMsg]; + ACE_LOGERROR(_errorMsg); - if (hasInterface) then {diag_log str "1"; + if (hasInterface) then { ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage); }; }; @@ -89,9 +89,9 @@ if (isMultiplayer) then { if !(_addons isEqualTo []) then { _errorMsg = format ["Client/Server Addon Mismatch. Client has extra addons: %1.",_addons]; - diag_log text format ["[ACE] ERROR: %1", _errorMsg]; + ACE_LOGERROR(_errorMsg); - if (hasInterface) then {diag_log str "1"; + if (hasInterface) then { ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage); }; }; diff --git a/addons/common/functions/fnc_checkPBOs.sqf b/addons/common/functions/fnc_checkPBOs.sqf index 5665ee632c..d1441ffd83 100644 --- a/addons/common/functions/fnc_checkPBOs.sqf +++ b/addons/common/functions/fnc_checkPBOs.sqf @@ -67,7 +67,7 @@ if (!isServer) then { }; //[_error, "{systemChat _this}"] call FUNC(execRemoteFnc); - diag_log text _error; + ACE_LOGERROR(_error); if (_mode < 2) then { _text = composeText [lineBreak, parseText format ["%1", _text]]; diff --git a/addons/common/functions/fnc_claim.sqf b/addons/common/functions/fnc_claim.sqf index f97b69e194..5c8014ee5f 100644 --- a/addons/common/functions/fnc_claim.sqf +++ b/addons/common/functions/fnc_claim.sqf @@ -13,7 +13,7 @@ * */ #include "script_component.hpp" - + PARAMS_3(_unit,_target,_lockTarget); if (isNil "_lockTarget") then {_lockTarget = false}; @@ -22,7 +22,7 @@ private "_owner"; _owner = _target getVariable [QGVAR(owner), objNull]; if (!isNull _owner && {!isNull _unit} && {_unit != _owner}) then { - diag_log text "[ACE] ERROR: Claiming already owned object."; + ACE_LOGERROR("Claiming already owned object."); }; // transfer this immediately diff --git a/addons/common/functions/fnc_debug.sqf b/addons/common/functions/fnc_debug.sqf index fd1d3d59fa..df770c6e25 100644 --- a/addons/common/functions/fnc_debug.sqf +++ b/addons/common/functions/fnc_debug.sqf @@ -55,4 +55,4 @@ if (_level <= _defaultLoglevel) then { // pass it onwards to the log function: // [0, [], compile format["%1",_msg], true] call FUNC(log); }; -true \ No newline at end of file +true diff --git a/addons/common/functions/fnc_doAnimation.sqf b/addons/common/functions/fnc_doAnimation.sqf index 07d9ec9e35..9588460ba1 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 { - diag_log format ["[ACE] ERROR: No animation specified in %1", _fnc_scriptNameParent]; + ACE_LOGERROR(format ["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 a11fbb07aa..af32efb434 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 { - diag_log text format ["[ACE] ERROR: No argument and function for remote function. ID: %1", _forEachIndex]; + ACE_LOGERROR(format ["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 8d4146faa5..783a1338e8 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 { - diag_log text format ["[ACE] ERROR: No array for function filter in %1", _fnc_scriptNameParent]; + ACE_LOGERROR(format ["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 308772bfff..c264b6fd50 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 { - diag_log text format ["[ACE] Map Grid Warning (%1) - Map uses letter grids [%2,%3]", worldName, _formatX, _formatY]; + ACE_LOGWARNING(format ["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 { - diag_log text format ["[ACE] Map Grid Warning (%1) - Northing is reversed", worldName]; + ACE_LOGWARNING(format ["Map Grid Warning (%1) - Northing is reversed.", worldName]); }; if (_stepXat5 != 1) then { - diag_log text format ["[ACE] Map Grid Warning (%1) - MGRS 10 digit grid does not equal 1 meter: (%2) for x", worldName, _stepXat5]; + ACE_LOGWARNING(format ["Map Grid Warning (%1) - MGRS 10 digit grid does not equal 1 meter: (%2) for x.", worldName, _stepXat5]); }; if ((_stepYat5 != 1) && {_stepYat5 != -1}) then { - diag_log text format ["[ACE] Map Grid Warning (%1) - MGRS 10 digit grid does not equal 1 meter: (%2) for y", worldName, _stepXat5]; + ACE_LOGWARNING(format ["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 4479ba04fa..1d41d2991a 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 { - diag_log text format ["[ACE] - Setting found, but couldn't localize [%1] (server has but we don't?)", _name]; + ACE_LOGWARNING(format ["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 256282f97f..b6b6bef5a9 100644 --- a/addons/common/functions/fnc_localEvent.sqf +++ b/addons/common/functions/fnc_localEvent.sqf @@ -21,16 +21,16 @@ _eventIndex = _eventNames find _eventName; if(_eventIndex != -1) then { _events = (GVAR(events) select 1) select _eventIndex; #ifdef DEBUG_EVENTS - diag_log text format[ARR_2("* Local Event: %1",_eventName)]; - diag_log text format[ARR_2(" args=%1",_eventArgs)]; + ACE_LOGINFO(format ["* Local Event: %1", _eventName]); + ACE_LOGINFO(format [" args=%1", _eventArgs]); #endif - + { if(!isNil "_x") then { - _eventArgs call CALLSTACK_NAMED(_x, format[ARR_3("Local Event %1 ID: %2",_eventName,_forEachIndex)]); + _eventArgs call CALLSTACK_NAMED(_x, format ["Local Event %1 ID: %2", _eventName, _forEachIndex]); #ifdef DEBUG_EVENTS_CALLSTACK - diag_log text format[ARR_2(" ID: %1",_forEachIndex)]; + ACE_LOGINFO(format [" ID: %1", _forEachIndex]); #endif }; } forEach _events; -}; \ No newline at end of file +}; diff --git a/addons/common/functions/fnc_map.sqf b/addons/common/functions/fnc_map.sqf index 16ed168218..455a19e2f7 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 { - diag_log text format ["[ACE] ERROR: No array for function map in %1", _fnc_scriptNameParent]; + ACE_LOGERROR(format ["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 c75324c9a3..bc87ff6fc5 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); -diag_log text format ["[ACE]: Check-PBOs Module Initialized. Mode: %1.", GVAR(checkPBOsAction)]; +ACE_LOGINFO(format ["Check-PBOs Module Initialized. Mode: %1.", GVAR(checkPBOsAction)]); diff --git a/addons/common/functions/fnc_moduleLSDVehicles.sqf b/addons/common/functions/fnc_moduleLSDVehicles.sqf index 59744016ce..0814451f79 100644 --- a/addons/common/functions/fnc_moduleLSDVehicles.sqf +++ b/addons/common/functions/fnc_moduleLSDVehicles.sqf @@ -44,4 +44,4 @@ if !(_activated) exitWith {}; }; } count _units; -diag_log text "[ACE]: WEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE."; +ACE_LOGINFO("WEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE."); diff --git a/addons/common/functions/fnc_readSettingFromModule.sqf b/addons/common/functions/fnc_readSettingFromModule.sqf index 0bf2693eba..b037224d19 100644 --- a/addons/common/functions/fnc_readSettingFromModule.sqf +++ b/addons/common/functions/fnc_readSettingFromModule.sqf @@ -20,7 +20,7 @@ PARAMS_3(_logic,_settingName,_moduleVariable); // Check if the parameter is defined in the module if (isNil {_logic getVariable _moduleVariable}) exitWith { - diag_log text format["[ACE]: Warning in %1 module: %2 setting is missing. Probably an obsolete version of the module is used in the mission.", typeOf _logic, _moduleVariable]; + ACE_LOGWARNING(format["Warning in %1 module: %2 setting is missing. Probably an obsolete version of the module is used in the mission.", typeOf _logic, _moduleVariable]); }; // Set the setting globally and force it diff --git a/addons/common/functions/fnc_removeSyncedEventHandler.sqf b/addons/common/functions/fnc_removeSyncedEventHandler.sqf index 84aa98c0ea..7202ec00b9 100644 --- a/addons/common/functions/fnc_removeSyncedEventHandler.sqf +++ b/addons/common/functions/fnc_removeSyncedEventHandler.sqf @@ -5,7 +5,7 @@ * * Argument: * 0: Name (String) - * + * * Return value: * Boolean of success */ @@ -16,7 +16,7 @@ PARAMS_1(_name); private ["_data", "_eventId"]; if (!HASH_HASKEY(GVAR(syncedEvents),_name)) exitWith { - diag_log text format["[ACE] Error, synced event key not found."]; + ACE_LOGERROR(format ["Synced event key not found."]); false }; @@ -24,4 +24,4 @@ _data = HASH_GET(GVAR(syncedEvents),_name); _eventId = _data select 3; [_eventId] call ace_common_fnc_removeEventHandler; -HASH_REM(GVAR(syncedEvents),_name); \ No newline at end of file +HASH_REM(GVAR(syncedEvents),_name); diff --git a/addons/common/functions/fnc_serverEvent.sqf b/addons/common/functions/fnc_serverEvent.sqf index 9227b1a783..f3118c481b 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 - diag_log text format[ARR_2("* Server Event: %1",_eventName)]; - diag_log text format[ARR_2(" args=%1",_eventArgs)]; + ACE_LOGINFO(format ["* Server Event: %1", _eventName]); + ACE_LOGINFO(format [" args=%1", _eventArgs]); #endif ACEg = [_eventName, _eventArgs]; diff --git a/addons/common/functions/fnc_syncedEvent.sqf b/addons/common/functions/fnc_syncedEvent.sqf index 9100e5a19a..42b2147f10 100644 --- a/addons/common/functions/fnc_syncedEvent.sqf +++ b/addons/common/functions/fnc_syncedEvent.sqf @@ -7,7 +7,7 @@ * 0: Name (String) * 1: Arguments (Array) * 2: TTL (Number or Code) [Optional] for this specific event call - * + * * Return value: * Boolean of success */ @@ -25,9 +25,9 @@ if( (count _this) > 2) then { }; if(!HASH_HASKEY(GVAR(syncedEvents),_name)) exitWith { - diag_log text format["[ACE] Error, synced event key not found."]; + ACE_LOGERROR("Synced event key not found."); false }; _eventData = [_name, _args,_ttl]; -["SEH", _eventData] call FUNC(globalEvent); \ No newline at end of file +["SEH", _eventData] call FUNC(globalEvent); diff --git a/addons/common/functions/fnc_targetEvent.sqf b/addons/common/functions/fnc_targetEvent.sqf index 22bd7431f5..1e4fed1a4e 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 - diag_log text format[ARR_3("* Target Event: %1 - %2",_eventName,_eventTargets)]; - diag_log text format[ARR_2(" args=%1",_eventArgs)]; + ACE_LOGINFO(format ["* Target Event: %1 - %2", _eventName, _eventTargets]); + ACE_LOGINFO(format [" args=%1", _eventArgs]); #endif ACEc = [_eventName, _eventTargets, _eventArgs]; @@ -30,4 +30,4 @@ if(!isServer) then { publicVariableServer "ACEc"; } else { ["ACEc", ACEc] call FUNC(_handleNetEvent); -}; \ No newline at end of file +}; diff --git a/addons/common/functions/fnc_unloadPersonLocal.sqf b/addons/common/functions/fnc_unloadPersonLocal.sqf index da2d9ea77e..fadb276670 100644 --- a/addons/common/functions/fnc_unloadPersonLocal.sqf +++ b/addons/common/functions/fnc_unloadPersonLocal.sqf @@ -37,11 +37,15 @@ if (_vehicle isKindOf "Ship" ) then { }; TRACE_1("getPosASL Vehicle Check", getPosASL _vehicle); -if (!_validVehiclestate) exitwith { diag_log 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]; false }; +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]); + false +}; -diag_log str _emptyPos; - -if (count _emptyPos == 0) exitwith {diag_log format["No safe empty spots to unload patient. %1", _emptyPos]; false}; //consider displaying text saying there are no safe places to exit the vehicle +if (count _emptyPos == 0) exitwith { + ACE_LOGWARNING(format ["No safe empty spots to unload patient. %1", _emptyPos]); + false +}; //consider displaying text saying there are no safe places to exit the vehicle unassignVehicle _unit; @@ -75,4 +79,4 @@ _loaded = _vehicle getvariable [QGVAR(loaded_persons),[]]; _loaded = _loaded - [_unit]; _vehicle setvariable [QGVAR(loaded_persons),_loaded,true]; -true \ No newline at end of file +true diff --git a/addons/disarming/functions/fnc_eventCallerFinish.sqf b/addons/disarming/functions/fnc_eventCallerFinish.sqf index bc48a26b70..7f270173e8 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]; -diag_log text format ["[ACE_Disarming] %1 - eventCallerFinish: %2", ACE_time, _this]; +ACE_LOGINFO(format ["%1 - eventCallerFinish: %2", ACE_time, _this]); diff --git a/addons/disarming/functions/fnc_eventTargetFinish.sqf b/addons/disarming/functions/fnc_eventTargetFinish.sqf index b9fb461356..a43592def1 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 { - diag_log text format ["[ACE_Disarming] %1 - eventTargetFinish: %2", ACE_time, _this]; + ACE_LOGINFO(format ["%1 - eventTargetFinish: %2", ACE_time, _this]); ["DisarmDebugCallback", [_caller], [_caller, _target, _errorMsg]] call EFUNC(common,targetEvent); }; diff --git a/addons/explosives/functions/fnc_module.sqf b/addons/explosives/functions/fnc_module.sqf index c74c73e679..6764e9bea4 100644 --- a/addons/explosives/functions/fnc_module.sqf +++ b/addons/explosives/functions/fnc_module.sqf @@ -23,4 +23,4 @@ params ["_logic"]; [_logic, QGVAR(PunishNonSpecialists),"PunishNonSpecialists"] call EFUNC(Common,readSettingFromModule); [_logic, QGVAR(ExplodeOnDefuse),"ExplodeOnDefuse"] call EFUNC(Common,readSettingFromModule); -diag_log text "[ACE]: Explosive Module Initialized."; +ACE_LOGINFO("Explosive Module Initialized."); diff --git a/addons/explosives/functions/fnc_placeExplosive.sqf b/addons/explosives/functions/fnc_placeExplosive.sqf index 544566b4c6..d414c40a6d 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 { - diag_log format ["ACE_Explosives: Error config not passed to PlaceExplosive: %1", _this]; + ACE_LOGERROR(format ["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 { - diag_log format ["ACE_Explosives: Error config not found in PlaceExplosive: %1", _this]; + ACE_LOGERROR(format ["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 a5a5472e1b..3f9a4834d1 100644 --- a/addons/frag/functions/fnc_doSpall.sqf +++ b/addons/frag/functions/fnc_doSpall.sqf @@ -1,6 +1,6 @@ //fnc_doSpall.sqf #include "script_component.hpp" -// ACE_player sideChat "WAAAAAAAAAAAAAAAAAAAAA"; +// ACE_player sideChat "WAAAAAAAAAAAAAAAAAAAAA"; private ["_hitData", "_initialData", "_hpData", "_object", "_foundObjects", "_index", "_foundObjecsts", "_roundType", "_round", "_caliber", "_explosive", "_idh", "_alive", "_exit", "_vm", "_velocity", "_oldVelocity", "_curVelocity", "_diff", "_polar", "_unitDir", "_spallPos", "_pos1", "_i", "_pos2", "_blah", "_data", "_spallPolar", "_warn", "_c", "_m", "_k", "_gC", "_fragPower", "_fragTypes", "_spread", "_spallCount", "_elev", "_dir", "_vel", "_spallFragVect", "_fragType", "_fragment", "_pos"]; @@ -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 { - diag_log text 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 ["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 e8d0f0ffa6..e775b423cf 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 { - diag_log text 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 ["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; @@ -187,9 +187,9 @@ if(_isArmed && (count _objects) > 0) then { _sectorOffset = 360 * (_i - 1) / (_randomCount max 1); _randomDir = random(_sectorSize); _vec = [cos(_sectorOffset + _randomDir), sin(_sectorOffset + _randomDir), sin(30 - (random 45))]; - + _fp = (_fragPower-(random (_fragPowerRandom))); - + _vel = _vec vectorMultiply _fp; _fragType = round (random ((count _fragTypes)-1)); @@ -197,7 +197,7 @@ if(_isArmed && (count _objects) > 0) then { _fragObj setPosASL _lastPos; _fragObj setVectorDir _vec; _fragObj setVelocity _vel; - + if(GVAR(traceFrags)) then { GVAR(TOTALFRAGS) = GVAR(TOTALFRAGS) + 1; [ACE_player, _fragObj, [1,0.5,0,1]] call FUNC(addTrack); @@ -205,7 +205,7 @@ if(_isArmed && (count _objects) > 0) then { _fragCount = _fragCount + 1; }; }; - + }; // #ifdef DEBUG_MODE_FULL // ACE_player sideChat format["total frags: %1", GVAR(TOTALFRAGS)]; diff --git a/addons/hearing/functions/fnc_moduleHearing.sqf b/addons/hearing/functions/fnc_moduleHearing.sqf index 6ec0af0231..0c720ba278 100644 --- a/addons/hearing/functions/fnc_moduleHearing.sqf +++ b/addons/hearing/functions/fnc_moduleHearing.sqf @@ -21,4 +21,4 @@ if ((_logic getVariable "DisableEarRinging") != -1) then { [_logic, QGVAR(DisableEarRinging), "DisableEarRinging"] call EFUNC(common,readSettingFromModule); }; -diag_log text "[ACE]: Hearing Module Initialized."; +ACE_LOGINFO("Hearing Module Initialized."); diff --git a/addons/interact_menu/functions/fnc_addActionToClass.sqf b/addons/interact_menu/functions/fnc_addActionToClass.sqf index 4d300d35a2..5befbd8427 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"); - diag_log text format ["action (%1) to parent %2 on object %3 [%4]", (_action select 0), _parentPath, _objectType, _typeNum]; + ACE_LOGERROR(format ["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/interaction/functions/fnc_moduleInteraction.sqf b/addons/interaction/functions/fnc_moduleInteraction.sqf index bd02093aa0..4d6ef3f1c0 100644 --- a/addons/interaction/functions/fnc_moduleInteraction.sqf +++ b/addons/interaction/functions/fnc_moduleInteraction.sqf @@ -26,4 +26,4 @@ if !(_activated) exitWith {}; [_logic, QGVAR(EnableTeamManagement), "EnableTeamManagement"] call EFUNC(common,readSettingFromModule); -diag_log text "[ACE]: Interaction Module Initialized."; +ACE_LOGINFO("Interaction Module Initialized."); diff --git a/addons/laser/functions/fnc_drawVisibleLaserTargets.sqf b/addons/laser/functions/fnc_drawVisibleLaserTargets.sqf index 10d5f1e1b6..690d38ce49 100644 --- a/addons/laser/functions/fnc_drawVisibleLaserTargets.sqf +++ b/addons/laser/functions/fnc_drawVisibleLaserTargets.sqf @@ -1,9 +1,9 @@ // This is a debug function for displaying visible lasers for ourselves #include "script_component.hpp" -diag_log text format["[ACE]: Laser Emitter Dump"]; +ACE_LOGINFO("Laser Emitter Dump"); -{ - diag_log text format[" %1", _x]; - diag_log text format[" %2", HASH_GET(GVAR(laserEmitters), _x)]; -} forEach GVAR(laserEmitters) select 0; \ No newline at end of file +{ + ACE_LOGINFO(format[" %1", _x]); + ACE_LOGINFO(format[" %2", HASH_GET(GVAR(laserEmitters), _x)]); +} forEach GVAR(laserEmitters) select 0; diff --git a/addons/laserpointer/functions/fnc_switchLaserLightMode.sqf b/addons/laserpointer/functions/fnc_switchLaserLightMode.sqf index 99549ec18f..d52cb1237c 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 { - diag_log text format ["Failed to add %1 to %2 - reverting to %3", _nextPointer, _weapon, _pointer]; + ACE_LOGERROR(format ["Failed to add %1 to %2 - reverting to %3", _nextPointer, _weapon, _pointer]); }; playSound "ACE_Sound_Click"; diff --git a/addons/map/functions/fnc_blueForceTrackingModule.sqf b/addons/map/functions/fnc_blueForceTrackingModule.sqf index bab776c9ab..f4477bd1c5 100644 --- a/addons/map/functions/fnc_blueForceTrackingModule.sqf +++ b/addons/map/functions/fnc_blueForceTrackingModule.sqf @@ -22,5 +22,5 @@ if !(_activated) exitWith {}; [_logic, QGVAR(BFT_Interval), "Interval"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(BFT_HideAiGroups), "HideAiGroups"] call EFUNC(common,readSettingFromModule); -diag_log text "[ACE]: Blue Force Tracking Module initialized."; +ACE_LOGINFO("Blue Force Tracking Module Initialized."); TRACE_2("[ACE]: Blue Force Tracking Module initialized.", GVAR(BFT_Interval), GVAR(BFT_HideAiGroups)); diff --git a/addons/map/functions/fnc_moduleMap.sqf b/addons/map/functions/fnc_moduleMap.sqf index b763db7eea..b7db6996d6 100644 --- a/addons/map/functions/fnc_moduleMap.sqf +++ b/addons/map/functions/fnc_moduleMap.sqf @@ -23,4 +23,4 @@ if !(_activated) exitWith {}; [_logic, QGVAR(mapLimitZoom), "MapLimitZoom" ] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(mapShowCursorCoordinates), "MapShowCursorCoordinates"] call EFUNC(common,readSettingFromModule); -diag_log text "[ACE]: Map Module Initialized."; +ACE_LOGINFO("Map Module Initialized."); diff --git a/addons/maptools/functions/fnc_handleMouseZChanged.sqf b/addons/maptools/functions/fnc_handleMouseZChanged.sqf index 35626238e5..0af86a81c5 100644 --- a/addons/maptools/functions/fnc_handleMouseZChanged.sqf +++ b/addons/maptools/functions/fnc_handleMouseZChanged.sqf @@ -17,8 +17,6 @@ private ["_dir", "_params", "_control", "_button", "_screenPos", "_shiftKey", "_ _control = _this select 0; _dir = _this select 1; -diag_log "Scroll"; -diag_log _this; _handled = false; _handled = true; diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf index f9f821eeb3..d3bcc4559e 100644 --- a/addons/medical/XEH_postInit.sqf +++ b/addons/medical/XEH_postInit.sqf @@ -284,7 +284,7 @@ if (USE_WOUND_EVENT_SYNC) then { if (hasInterface) then { ["PlayerJip", { - diag_log format["[ACE] JIP Medical init for player"]; + ACE_LOGINFO("JIP Medical init for player."); [player] call FUNC(init); }] call EFUNC(common,addEventHandler); }; diff --git a/addons/nametags/functions/fnc_initIsSpeaking.sqf b/addons/nametags/functions/fnc_initIsSpeaking.sqf index 9299611d3b..4d4d576c52 100644 --- a/addons/nametags/functions/fnc_initIsSpeaking.sqf +++ b/addons/nametags/functions/fnc_initIsSpeaking.sqf @@ -38,14 +38,14 @@ if (!hasInterface) exitWith {}; if (isClass (configFile >> "cfgPatches" >> "acre_api")) then { - diag_log text format ["[ACE_nametags] - ACRE Detected"]; + ACE_LOGINFO("ACRE Detected."); DFUNC(isSpeaking) = { params ["_unit"]; (([_unit] call acre_api_fnc_isSpeaking) || {[ACE_player] call acre_api_fnc_isBroadcasting}) && {!(_unit getVariable ["ACE_isUnconscious", false])} }; } else { if (isClass (configFile >> "cfgPatches" >> "task_force_radio")) then { - diag_log text format ["[ACE_nametags] - TFR Detected"]; + ACE_LOGINFO("TFR Detected."); DFUNC(isSpeaking) = { params ["_unit"]; (_unit getVariable ["tf_isSpeaking", false]) && {!(_unit getVariable ["ACE_isUnconscious", false])} diff --git a/addons/nametags/functions/fnc_moduleNameTags.sqf b/addons/nametags/functions/fnc_moduleNameTags.sqf index 1b209cb32a..079e4aa704 100644 --- a/addons/nametags/functions/fnc_moduleNameTags.sqf +++ b/addons/nametags/functions/fnc_moduleNameTags.sqf @@ -33,4 +33,4 @@ if ((_logic getVariable "showVehicleCrewInfo") != -1) then { [_logic, QGVAR(showVehicleCrewInfo), "showVehicleCrewInfo" ] call EFUNC(common,readSettingFromModule); }; -diag_log text "[ACE]: NameTags Module Initialized."; +ACE_LOGINFO("Nametags Module Initialized."); diff --git a/addons/overheating/functions/fnc_cooldown.sqf b/addons/overheating/functions/fnc_cooldown.sqf index 8fb0e0127b..0a6f93ee0f 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 { - diag_log text format ["[ACE] ERROR: _totalTime = %1; _time = %2; _deltaTime = %3;", _totalTime, _time, _deltaTime]; + ACE_LOGERROR(format ["_totalTime = %1; _time = %2; _deltaTime = %3;", _totalTime, _time, _deltaTime]); 0 }; diff --git a/addons/reload/XEH_postInit.sqf b/addons/reload/XEH_postInit.sqf index 9d5110d330..519cac00f0 100644 --- a/addons/reload/XEH_postInit.sqf +++ b/addons/reload/XEH_postInit.sqf @@ -27,8 +27,6 @@ if !(hasInterface) exitWith {}; // Listen for attempts to link ammo ["linkedAmmo", { EXPLODE_3_PVT(_this,_receiver,_giver,_magazine); - diag_log "linkedAmmo"; - diag_log _this; private ["_magazineCfg","_magazineType"]; _magazineType = currentMagazine _receiver; @@ -62,8 +60,6 @@ if !(hasInterface) exitWith {}; // Listen for returned magazines ["returnedAmmo", { EXPLODE_3_PVT(_this,_receiver,_giver,_magazine); - diag_log "returnedAmmo"; - diag_log _this; _receiver addMagazine _magazine; }] call EFUNC(common,addEventhandler); diff --git a/addons/repair/functions/fnc_addRepairActions.sqf b/addons/repair/functions/fnc_addRepairActions.sqf index 0a0e35c06e..88f038e447 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 }; - diag_log text format ["[ACE] ERROR: Invalid custom position %1 of hitpoint %2 in vehicle %3", _position, _hitpoint, _vehicle]; + ACE_LOGERROR(format ["Invalid custom position %1 of hitpoint %2 in vehicle %3.", _position, _hitpoint, _vehicle]); }; } forEach (getArray _customSelectionsConfig); }; diff --git a/addons/repair/functions/fnc_moduleRepairSettings.sqf b/addons/repair/functions/fnc_moduleRepairSettings.sqf index 3b97d2f168..a0fc93d259 100644 --- a/addons/repair/functions/fnc_moduleRepairSettings.sqf +++ b/addons/repair/functions/fnc_moduleRepairSettings.sqf @@ -31,4 +31,4 @@ if (!isServer) exitWith {}; [_logic, QGVAR(fullRepairLocation), "fullRepairLocation"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(engineerSetting_fullRepair), "engineerSetting_fullRepair"] call EFUNC(common,readSettingFromModule); -diag_log text "[ACE]: Repair Module Initialized."; +ACE_LOGINFO("Repair Module Initialized."); diff --git a/addons/respawn/functions/fnc_initRallypoint.sqf b/addons/respawn/functions/fnc_initRallypoint.sqf index 2ef158a419..bb295a1809 100644 --- a/addons/respawn/functions/fnc_initRallypoint.sqf +++ b/addons/respawn/functions/fnc_initRallypoint.sqf @@ -1,15 +1,15 @@ /* Name: ACE_Respawn_fnc_initRallypoint - + Author(s): commy2 - + Description: init code for rally points - + Parameters: 0: OBJECT - rally - + Returns: VOID */ @@ -26,9 +26,9 @@ if (hasInterface) then { // fix init having wrong position, vars etc. [_rallypoint, _respawnMarker, _side, _name] spawn { PARAMS_4(_rallypoint,_respawnMarker,_side,_name); - + private ["_marker", "_type"]; - + _marker = format ["ACE_Marker_%1", _name]; // exit if it already exist @@ -65,5 +65,5 @@ if (isNil _name) then { } else { deleteVehicle _rallypoint; - diag_log text "[ACE] Respawn: ERROR Multiple Rallypoints of same type."; + ACE_LOGERROR("Multiple Rallypoints of same type."); }; diff --git a/addons/respawn/functions/fnc_module.sqf b/addons/respawn/functions/fnc_module.sqf index 3f1ef89a1f..8921c75f54 100644 --- a/addons/respawn/functions/fnc_module.sqf +++ b/addons/respawn/functions/fnc_module.sqf @@ -18,7 +18,7 @@ #include "script_component.hpp" -PARAMS_3(_logic,_units,_activated); +PARAMS_3(_logic,_units,_activated); if !(isServer) exitWith {}; @@ -45,4 +45,4 @@ if (isServer) then { }; }; -diag_log text "[ACE]: Respawn Module Initialized."; +ACE_LOGINFO("Respawn Module Initialized."); diff --git a/addons/respawn/functions/fnc_moduleFriendlyFire.sqf b/addons/respawn/functions/fnc_moduleFriendlyFire.sqf index 7641db806d..2d81372e85 100644 --- a/addons/respawn/functions/fnc_moduleFriendlyFire.sqf +++ b/addons/respawn/functions/fnc_moduleFriendlyFire.sqf @@ -1,17 +1,17 @@ /* Name: ACE_Respawn_fnc_moduleFriendlyFire - + Author(s): commy2 - + Description: initializes the Friendly Fire Messages module - + Parameters: 0: OBJECT - logic 1: ARRAY - synced units 2: BOOLEAN - activated - + Returns: VOID */ @@ -19,7 +19,7 @@ #include "script_component.hpp" _this spawn { - PARAMS_3(_logic,_units,_activated); + PARAMS_3(_logic,_units,_activated); if !(_activated) exitWith {}; @@ -28,5 +28,5 @@ _this spawn { publicVariable QGVAR(showFriendlyFireMessage); }; - diag_log text "[ACE]: Friendly Fire Messages Module Initialized."; + ACE_LOGINFO("Friendly Fire Messages Module Initialized."); }; diff --git a/addons/respawn/functions/fnc_moduleRallypoint.sqf b/addons/respawn/functions/fnc_moduleRallypoint.sqf index 15c415027d..86a83bf061 100644 --- a/addons/respawn/functions/fnc_moduleRallypoint.sqf +++ b/addons/respawn/functions/fnc_moduleRallypoint.sqf @@ -1,17 +1,17 @@ /* Name: ACE_Respawn_fnc_moduleRallypoint - + Author(s): commy2 - + Description: initializes the Rallypoint module - + Parameters: 0: OBJECT - logic 1: ARRAY - synced units 2: BOOLEAN - activated - + Returns: VOID */ @@ -26,4 +26,4 @@ if !(_activated) exitWith {}; _x setVariable ["ACE_canMoveRallypoint", true]; } forEach _units; -diag_log text "[ACE]: Rallypoint Module Initialized."; +ACE_LOGINFO("Rallypoint Module Initialized."); diff --git a/addons/sitting/functions/fnc_moduleInit.sqf b/addons/sitting/functions/fnc_moduleInit.sqf index ae476317db..c21d92afbb 100644 --- a/addons/sitting/functions/fnc_moduleInit.sqf +++ b/addons/sitting/functions/fnc_moduleInit.sqf @@ -22,4 +22,4 @@ if (!_activated) exitWith {}; [_logic, QGVAR(enable), "enable"] call EFUNC(common,readSettingFromModule); -diag_log text "[ACE]: Sitting Module Initialized."; +ACE_LOGINFO("Sitting Module Initialized."); diff --git a/addons/slideshow/functions/fnc_createSlideshow.sqf b/addons/slideshow/functions/fnc_createSlideshow.sqf index 665b954496..5c91a3fa10 100644 --- a/addons/slideshow/functions/fnc_createSlideshow.sqf +++ b/addons/slideshow/functions/fnc_createSlideshow.sqf @@ -25,7 +25,7 @@ params ["_objects", "_controllers", "_images", "_names", "_duration"]; // Verify data if (count _images != count _names || {count _images == 0} || {count _names == 0}) exitWith { - diag_log "[ACE] ERROR: Slideshow Images or Names fields can NOT be empty and must have equal number of items!" + ACE_LOGERROR("Slideshow Images or Names fields can NOT be empty and must have equal number of items!"); }; // Objects synced to the module @@ -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; - diag_log text format ["[ACE]: Slideshow: Interaction Menu module not present, defaulting duration value to %1", _duration]; + ACE_LOGINFO(format ["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 da1724dfcc..e887e58915 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); -diag_log text format ["[ACE]: Slideshow Module Initialized for: %1 with Duration: %2", _objects, _duration]; +ACE_LOGINFO(format ["Slideshow Module Initialized for: %1 with Duration: %2", _objects, _duration]); diff --git a/addons/switchunits/functions/fnc_module.sqf b/addons/switchunits/functions/fnc_module.sqf index ec9164a866..3b8cea4037 100644 --- a/addons/switchunits/functions/fnc_module.sqf +++ b/addons/switchunits/functions/fnc_module.sqf @@ -35,4 +35,4 @@ GVAR(Module) = true; [QGVAR(EnableSwitchUnits), true, false, true] call EFUNC(common,setSetting); -diag_log text "[ACE]: SwitchUnits Module Initialized."; +ACE_LOGINFO("Switch Unit Module Initialized."); diff --git a/addons/viewdistance/functions/fnc_initModule.sqf b/addons/viewdistance/functions/fnc_initModule.sqf index 912242f373..3150d56908 100644 --- a/addons/viewdistance/functions/fnc_initModule.sqf +++ b/addons/viewdistance/functions/fnc_initModule.sqf @@ -20,10 +20,10 @@ if (!isServer) exitWith {}; params ["_logic", "_units", "_activated"]; if (!_activated) exitWith { - diag_log text "[ACE]: View Distance Limit Module is placed but NOT active."; + ACE_LOGWARNING("View Distance Limit Module is placed but NOT active."); }; [_logic, QGVAR(enabled),"moduleViewDistanceEnabled"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(limitViewDistance),"moduleViewDistanceLimit"] call EFUNC(common,readSettingFromModule); -diag_log format ["[ACE]: View Distance Limit Module Initialized. Limit set by module: %1",GVAR(limitViewDistance)]; +ACE_LOGINFO(format ["View Distance Limit Module Initialized. Limit set by module: %1", GVAR(limitViewDistance)]); From 097506076f9e25feb00ec171944fb10daef544d4 Mon Sep 17 00:00:00 2001 From: Michael Braun Date: Wed, 26 Aug 2015 16:48:55 +0200 Subject: [PATCH 03/35] 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))]); From 5047d4de1c49a3c88c3f830fa1f9b6a28b9adc32 Mon Sep 17 00:00:00 2001 From: Michael Braun Date: Wed, 26 Aug 2015 17:39:44 +0200 Subject: [PATCH 04/35] Switched to ACE_LOG_# variation --- addons/common/XEH_postInit.sqf | 2 +- addons/common/functions/fnc__handleNetEvent.sqf | 6 +++--- 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_readSettingFromModule.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 +- addons/laser/functions/fnc_drawVisibleLaserTargets.sqf | 4 ++-- .../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 +- 31 files changed, 47 insertions(+), 47 deletions(-) diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf index 97c54945e8..00831b60f5 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 [ARR_3("Headbug Used: Name: %1, Animation: %2", _profileName, _animation)]); + ACE_LOGINFO_2("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 516be7c666..b83501bc42 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 [ARR_2("* Net Event %1", _eventName)]); - ACE_LOGINFO(format [ARR_2(" args=%1", _eventArgs)]); + ACE_LOGINFO_1("* Net Event %1",_eventName); + ACE_LOGINFO_1(" args=%1",_eventArgs); #endif { if (!isNil "_x") then { _eventArgs call CALLSTACK_NAMED(_x, format [ARR_3("Net Event %1 ID: %2", _eventName, _forEachIndex)]); #ifdef DEBUG_EVENTS_CALLSTACK - ACE_LOGINFO(format [ARR_2(" ID: %1", _forEachIndex)]); + ACE_LOGINFO_1(" ID: %1",_forEachIndex); #endif }; } forEach _events; diff --git a/addons/common/functions/fnc__handleRequestSyncedEvent.sqf b/addons/common/functions/fnc__handleRequestSyncedEvent.sqf index f94c2c76fe..b93347b8d8 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 [ARR_2("[%1] synchronized", _eventName)]); + ACE_LOGINFO_1("[%1] synchronized",_eventName); }; true diff --git a/addons/common/functions/fnc_addToInventory.sqf b/addons/common/functions/fnc_addToInventory.sqf index dec3384dee..05fc2ca48f 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 [ARR_3("Incorrect item type passed to %1, passed: %2",QFUNC(AddToInventory),_type)]); + ACE_LOGWARNING_2("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 ad58fb3cb7..e093f44393 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 [ARR_2("Clear cached variables on event: %1", _eventName)]); + ACE_LOGINFO_1("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 [ARR_3("Calculated result: %1 %2", _namespace, _uid)]); + ACE_LOGINFO_2("Calculated result: %1 %2",_namespace,_uid); } else { - ACE_LOGINFO(format [ARR_3("Cached result: %1 %2", _namespace, _uid)]); + ACE_LOGINFO_2("Cached result: %1 %2",_namespace,_uid); #endif }; diff --git a/addons/common/functions/fnc_checkFiles.sqf b/addons/common/functions/fnc_checkFiles.sqf index 5d29420402..68f134ab5b 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 [ARR_2("ACE is version %1.", _version)]); +ACE_LOGINFO_1("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 [ARR_3("Extension version: %1: %2", _x, (_x callExtension "version"))]); + ACE_LOGINFO_2("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 e3fd5265ba..81301ce1dc 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 [ARR_2("No animation specified in %1.", _fnc_scriptNameParent)]); + ACE_LOGERROR_1("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 1f9da6cd12..bbc4e91ea7 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 [ARR_2("No argument and function for remote function. ID: %1", _forEachIndex)]); + ACE_LOGERROR_1("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 06080d046a..3d84d9d3a2 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 [ARR_2("No array for function filter in %1.", _fnc_scriptNameParent)]); + ACE_LOGERROR_1("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 d831253713..838b753e91 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 [ARR_4("Map Grid Warning (%1) - Map uses letter grids [%2, %3]", worldName, _formatX, _formatY)]); + ACE_LOGWARNING_3("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 [ARR_2("Map Grid Warning (%1) - Northing is reversed.", worldName)]); + ACE_LOGWARNING_1("Map Grid Warning (%1) - Northing is reversed.",worldName); }; if (_stepXat5 != 1) then { - ACE_LOGWARNING(format [ARR_3("Map Grid Warning (%1) - MGRS 10 digit grid does not equal 1 meter: (%2) for x.", worldName, _stepXat5)]); + ACE_LOGWARNING_2("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 [ARR_3("Map Grid Warning (%1) - MGRS 10 digit grid does not equal 1 meter: (%2) for y.", worldName, _stepXat5)]); + ACE_LOGWARNING_2("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 742ed7a6bd..25a67b6079 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 [ARR_2("Setting found, but couldn't localize [%1] (server has but we don't?)", _name)]); + ACE_LOGWARNING_1("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 88ff3c11aa..fb0cbaf40f 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 [ARR_2("* Local Event: %1", _eventName)]); - ACE_LOGINFO(format [ARR_2(" args=%1", _eventArgs)]); + ACE_LOGINFO_1("* Local Event: %1",_eventName); + ACE_LOGINFO_1(" args=%1",_eventArgs); #endif { if(!isNil "_x") then { - _eventArgs call CALLSTACK_NAMED(_x, format [ARR_3("Local Event %1 ID: %2", _eventName, _forEachIndex)]); + _eventArgs call CALLSTACK_NAMED(_x, FORMAT_2("Local Event %1 ID: %2",_eventName,_forEachIndex)); #ifdef DEBUG_EVENTS_CALLSTACK - ACE_LOGINFO(format [ARR_2(" ID: %1", _forEachIndex)]); + ACE_LOGINFO_1(" ID: %1",_forEachIndex); #endif }; } forEach _events; diff --git a/addons/common/functions/fnc_map.sqf b/addons/common/functions/fnc_map.sqf index 53e5b39fe9..bca205e34a 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 [ARR_2("No array for function map in %1.", _fnc_scriptNameParent)]); + ACE_LOGERROR_1("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 496a857698..0288badf2d 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 [ARR_2("Check-PBOs Module Initialized. Mode: %1.", GVAR(checkPBOsAction))]); +ACE_LOGINFO_1("Check-PBOs Module Initialized. Mode: %1.",GVAR(checkPBOsAction)); diff --git a/addons/common/functions/fnc_readSettingFromModule.sqf b/addons/common/functions/fnc_readSettingFromModule.sqf index b037224d19..843ac2ba8f 100644 --- a/addons/common/functions/fnc_readSettingFromModule.sqf +++ b/addons/common/functions/fnc_readSettingFromModule.sqf @@ -20,7 +20,7 @@ PARAMS_3(_logic,_settingName,_moduleVariable); // Check if the parameter is defined in the module if (isNil {_logic getVariable _moduleVariable}) exitWith { - ACE_LOGWARNING(format["Warning in %1 module: %2 setting is missing. Probably an obsolete version of the module is used in the mission.", typeOf _logic, _moduleVariable]); + ACE_LOGWARNING_2("Warning in %1 module: %2 setting is missing. Probably an obsolete version of the module is used in the mission.",typeOf _logic,_moduleVariable]); }; // Set the setting globally and force it diff --git a/addons/common/functions/fnc_serverEvent.sqf b/addons/common/functions/fnc_serverEvent.sqf index 6bc056dd6f..4a9960c197 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 [ARR_2("* Server Event: %1", _eventName)]); - ACE_LOGINFO(format [ARR_2(" args=%1", _eventArgs)]); + ACE_LOGINFO_1("* Server Event: %1",_eventName); + ACE_LOGINFO_1(" args=%1",_eventArgs); #endif ACEg = [_eventName, _eventArgs]; diff --git a/addons/common/functions/fnc_targetEvent.sqf b/addons/common/functions/fnc_targetEvent.sqf index 3653cc4669..75023a38b5 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 [ARR_3("* Target Event: %1 - %2", _eventName, _eventTargets)]); - ACE_LOGINFO(format [ARR_2(" args=%1", _eventArgs)]); + ACE_LOGINFO_2("* Target Event: %1 - %2",_eventName,_eventTargets); + ACE_LOGINFO_1(" 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 49646fa38a..150ea8c500 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 [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)]); + ACE_LOGWARNING_4("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 [ARR_2("No safe empty spots to unload patient. %1", _emptyPos)]); + ACE_LOGWARNING_1("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 13e4e50921..e1376f4052 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 [ARR_3("%1 - eventCallerFinish: %2", ACE_time, _this)]); +ACE_LOGINFO_2("%1 - eventCallerFinish: %2",ACE_time,_this); diff --git a/addons/disarming/functions/fnc_eventTargetFinish.sqf b/addons/disarming/functions/fnc_eventTargetFinish.sqf index a887eb8092..b7364a8f40 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 [ARR_3("%1 - eventTargetFinish: %2", ACE_time, _this)]); + ACE_LOGINFO_2("%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 40ca6a3900..5e4999b1f4 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 [ARR_2("Config not passed to PlaceExplosive: %1",_this)]); + ACE_LOGERROR_1("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 [ARR_2("Config not found in PlaceExplosive: %1",_this)]); + ACE_LOGERROR_1("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 1f6b813a8a..57b5d330c7 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 [ARR_2("Ammo class %1 lacks proper explosive properties definitions for frag!", _roundType)]); //TODO: turn this off when we get closer to release + ACE_LOGWARNING_1("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 15ffe4d97d..3507a7ab6e 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 [ARR_2("Ammo class %1 lacks proper explosive properties definitions for frag!", _shellType)]); //TODO: turn this off when we get closer to release + ACE_LOGWARNING_1("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 55b300fe7f..f720903a6d 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 [ARR_5("action (%1) to parent %2 on object %3 [%4]", (_action select 0), _parentPath, _objectType, _typeNum)]); + ACE_LOGERROR_4("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/laser/functions/fnc_drawVisibleLaserTargets.sqf b/addons/laser/functions/fnc_drawVisibleLaserTargets.sqf index 690d38ce49..8cdb497267 100644 --- a/addons/laser/functions/fnc_drawVisibleLaserTargets.sqf +++ b/addons/laser/functions/fnc_drawVisibleLaserTargets.sqf @@ -4,6 +4,6 @@ ACE_LOGINFO("Laser Emitter Dump"); { - ACE_LOGINFO(format[" %1", _x]); - ACE_LOGINFO(format[" %2", HASH_GET(GVAR(laserEmitters), _x)]); + ACE_LOGINFO_1(" %1", _x); + ACE_LOGINFO_1(" %1",HASH_GET(GVAR(laserEmitters),_x)); } forEach GVAR(laserEmitters) select 0; diff --git a/addons/laserpointer/functions/fnc_switchLaserLightMode.sqf b/addons/laserpointer/functions/fnc_switchLaserLightMode.sqf index 4b1b45b75c..3332631c49 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 [ARR_4("Failed to add %1 to %2 - reverting to %3", _nextPointer, _weapon, _pointer)]); + ACE_LOGERROR_3("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 934c9a0abc..9e54d35b56 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 [ARR_4("_totalTime = %1; _time = %2; _deltaTime = %3;", _totalTime, _time, _deltaTime)]); + ACE_LOGERROR_3("_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 a6ecde45a9..9cd89838ae 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 [ARR_4("Invalid custom position %1 of hitpoint %2 in vehicle %3.", _position, _hitpoint, _vehicle)]); + ACE_LOGERROR_3("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 96089dc986..9b7209ad60 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 [ARR_2("Interaction Menu module not present, defaulting duration value to %1", _duration)]); + ACE_LOGINFO_1("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 0e205a7530..901d1aa10e 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 [ARR_3("Slideshow Module Initialized for: %1 with Duration: %2", _objects, _duration)]); +ACE_LOGINFO_2("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 948fd56ef1..47cf27025e 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 [ARR_2("View Distance Limit Module Initialized. Limit set by module: %1", GVAR(limitViewDistance))]); +ACE_LOGINFO_1("View Distance Limit Module Initialized. Limit set by module: %1",GVAR(limitViewDistance)); From 3dc3331d87b3147a1d67b6a87a73bda9e8ad9522 Mon Sep 17 00:00:00 2001 From: Michael Braun Date: Wed, 26 Aug 2015 17:45:17 +0200 Subject: [PATCH 05/35] Replaced rogue format with FORMAT_# --- addons/common/functions/fnc__handleNetEvent.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/common/functions/fnc__handleNetEvent.sqf b/addons/common/functions/fnc__handleNetEvent.sqf index b83501bc42..921f2a08f6 100644 --- a/addons/common/functions/fnc__handleNetEvent.sqf +++ b/addons/common/functions/fnc__handleNetEvent.sqf @@ -24,7 +24,7 @@ if (_eventType == "ACEg") then { { if (!isNil "_x") then { - _eventArgs call CALLSTACK_NAMED(_x, format [ARR_3("Net Event %1 ID: %2", _eventName, _forEachIndex)]); + _eventArgs call CALLSTACK_NAMED(_x, FORMAT_2("Net Event %1 ID: %2",_eventName,_forEachIndex); #ifdef DEBUG_EVENTS_CALLSTACK ACE_LOGINFO_1(" ID: %1",_forEachIndex); #endif From 36aeb61d815cdfedbeb97b6dce9f349c4d33855c Mon Sep 17 00:00:00 2001 From: Michael Braun Date: Wed, 26 Aug 2015 17:51:56 +0200 Subject: [PATCH 06/35] Fixed error caused by closing square bracket --- addons/common/functions/fnc_readSettingFromModule.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/common/functions/fnc_readSettingFromModule.sqf b/addons/common/functions/fnc_readSettingFromModule.sqf index 843ac2ba8f..545a93deba 100644 --- a/addons/common/functions/fnc_readSettingFromModule.sqf +++ b/addons/common/functions/fnc_readSettingFromModule.sqf @@ -20,7 +20,7 @@ PARAMS_3(_logic,_settingName,_moduleVariable); // Check if the parameter is defined in the module if (isNil {_logic getVariable _moduleVariable}) exitWith { - ACE_LOGWARNING_2("Warning in %1 module: %2 setting is missing. Probably an obsolete version of the module is used in the mission.",typeOf _logic,_moduleVariable]); + ACE_LOGWARNING_2("Warning in %1 module: %2 setting is missing. Probably an obsolete version of the module is used in the mission.",typeOf _logic,_moduleVariable); }; // Set the setting globally and force it From 5d612abd028cbe9db09670fe7ca78ff6ead7db0b Mon Sep 17 00:00:00 2001 From: jokoho48 Date: Tue, 1 Sep 2015 00:42:13 +0200 Subject: [PATCH 07/35] posible Fix for #2310 --- addons/optionsmenu/config.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addons/optionsmenu/config.cpp b/addons/optionsmenu/config.cpp index 17e4887db6..bf8e48fb78 100644 --- a/addons/optionsmenu/config.cpp +++ b/addons/optionsmenu/config.cpp @@ -32,3 +32,10 @@ class CfgAddons { class ACE_Extensions { extensions[] += {"ace_clipboard"}; }; + + +class CfgCommands { + allowedHTMLLoadURIs = { + "http://ace3mod.com/version.html" + }; +}; From afee398b113c987e370d6d5251dd8a74e7b15229 Mon Sep 17 00:00:00 2001 From: jokoho48 Date: Tue, 1 Sep 2015 00:51:32 +0200 Subject: [PATCH 08/35] woops --- addons/optionsmenu/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/optionsmenu/config.cpp b/addons/optionsmenu/config.cpp index bf8e48fb78..e740448d9e 100644 --- a/addons/optionsmenu/config.cpp +++ b/addons/optionsmenu/config.cpp @@ -35,7 +35,7 @@ class ACE_Extensions { class CfgCommands { - allowedHTMLLoadURIs = { + allowedHTMLLoadURIs[] = { "http://ace3mod.com/version.html" }; }; From 3f4d0af940802d89fd494c1346a0f470582b6253 Mon Sep 17 00:00:00 2001 From: jokoho48 Date: Tue, 1 Sep 2015 01:03:34 +0200 Subject: [PATCH 09/35] prevent Issues with other mods --- addons/optionsmenu/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/optionsmenu/config.cpp b/addons/optionsmenu/config.cpp index e740448d9e..4acfef321f 100644 --- a/addons/optionsmenu/config.cpp +++ b/addons/optionsmenu/config.cpp @@ -35,7 +35,7 @@ class ACE_Extensions { class CfgCommands { - allowedHTMLLoadURIs[] = { + allowedHTMLLoadURIs[] += { "http://ace3mod.com/version.html" }; }; From defbdf1b1aec38a655af555a2dfd01ef9731297e Mon Sep 17 00:00:00 2001 From: jokoho48 Date: Wed, 9 Sep 2015 17:05:48 +0200 Subject: [PATCH 10/35] fix that HC throw a issue if PPEffect was used/applyed --- addons/common/functions/fnc_blurScreen.sqf | 2 ++ addons/gforces/functions/fnc_pfhUpdateGForces.sqf | 4 +++- addons/goggles/XEH_postInit.sqf | 2 +- addons/goggles/functions/fnc_applyDust.sqf | 2 ++ addons/goggles/functions/fnc_applyGlassesEffect.sqf | 2 ++ addons/goggles/functions/fnc_onEachFrame.sqf | 1 + addons/goggles/functions/fnc_removeGlassesEffect.sqf | 1 + addons/grenades/functions/fnc_flashbangExplosionEH.sqf | 2 +- addons/huntir/functions/fnc_cam.sqf | 1 + addons/medical/XEH_postInit.sqf | 4 +++- addons/nightvision/XEH_postInitClient.sqf | 2 +- addons/nightvision/functions/fnc_blending.sqf | 2 ++ addons/nightvision/functions/fnc_changeNVGBrightness.sqf | 1 + addons/nightvision/functions/fnc_updatePPEffects.sqf | 2 ++ 14 files changed, 23 insertions(+), 5 deletions(-) diff --git a/addons/common/functions/fnc_blurScreen.sqf b/addons/common/functions/fnc_blurScreen.sqf index 57714b63cd..fd2964854d 100644 --- a/addons/common/functions/fnc_blurScreen.sqf +++ b/addons/common/functions/fnc_blurScreen.sqf @@ -10,6 +10,8 @@ #include "script_component.hpp" +if !(hasInterface) exitWith {}; + private ["_show"]; PARAMS_1(_id); _show = if (count _this > 1) then {_this select 1} else {false}; diff --git a/addons/gforces/functions/fnc_pfhUpdateGForces.sqf b/addons/gforces/functions/fnc_pfhUpdateGForces.sqf index a4cb047629..9692ecfcc7 100644 --- a/addons/gforces/functions/fnc_pfhUpdateGForces.sqf +++ b/addons/gforces/functions/fnc_pfhUpdateGForces.sqf @@ -13,8 +13,10 @@ */ #include "script_component.hpp" +if !(hasInterface) exitWith {}; + private ["_interval", "_player", "_newVel", "_accel", "_currentGForce", "_average", "_sum", "_classCoef", "_suitCoef", "_gBlackOut", "_gRedOut", "_g", "_gBO", "_coef", "_strength"]; - + EXPLODE_2_PVT(_this,_params,_pfhId); _interval = ACE_time - GVAR(lastUpdateTime); diff --git a/addons/goggles/XEH_postInit.sqf b/addons/goggles/XEH_postInit.sqf index 088ccc477a..cd4a7591e7 100644 --- a/addons/goggles/XEH_postInit.sqf +++ b/addons/goggles/XEH_postInit.sqf @@ -15,7 +15,7 @@ * Public: No */ #include "script_component.hpp" -if (!hasInterface) exitWith {}; +if !(hasInterface) exitWith {}; ["ACE3 Common", QGVAR(wipeGlasses), localize LSTRING(WipeGlasses), { diff --git a/addons/goggles/functions/fnc_applyDust.sqf b/addons/goggles/functions/fnc_applyDust.sqf index 35677657a7..ab9abf5e7c 100644 --- a/addons/goggles/functions/fnc_applyDust.sqf +++ b/addons/goggles/functions/fnc_applyDust.sqf @@ -14,6 +14,8 @@ * Public: Yes */ #include "script_component.hpp" + +if !(hasInterface) exitWith {}; if (call FUNC(ExternalCamera)) exitWith {}; if ([ace_player] call FUNC(isGogglesVisible)) exitWith { 100 cutRsc["RscACE_GogglesEffects", "PLAIN",2,false]; diff --git a/addons/goggles/functions/fnc_applyGlassesEffect.sqf b/addons/goggles/functions/fnc_applyGlassesEffect.sqf index 8c2edb531e..2dff54b345 100644 --- a/addons/goggles/functions/fnc_applyGlassesEffect.sqf +++ b/addons/goggles/functions/fnc_applyGlassesEffect.sqf @@ -16,6 +16,8 @@ * Public: No */ #include "script_component.hpp" +if !(hasInterface) exitWith {}; + private["_postProcessColour", "_postProcessTintAmount", "_glassesClassname", "_glassImagePath"]; _glassesClassname = _this select 0; diff --git a/addons/goggles/functions/fnc_onEachFrame.sqf b/addons/goggles/functions/fnc_onEachFrame.sqf index 863046da7f..b2606e6c72 100644 --- a/addons/goggles/functions/fnc_onEachFrame.sqf +++ b/addons/goggles/functions/fnc_onEachFrame.sqf @@ -14,6 +14,7 @@ * Public: No */ #include "script_component.hpp" +if !(hasInterface) exitWith {}; if (isNull(ace_player)) exitWith {}; GVAR(FrameEvent) set [0, !(GVAR(FrameEvent) select 0)]; if (GVAR(FrameEvent) select 0) exitWith { diff --git a/addons/goggles/functions/fnc_removeGlassesEffect.sqf b/addons/goggles/functions/fnc_removeGlassesEffect.sqf index c7965fefbc..f587593b30 100644 --- a/addons/goggles/functions/fnc_removeGlassesEffect.sqf +++ b/addons/goggles/functions/fnc_removeGlassesEffect.sqf @@ -15,6 +15,7 @@ * Public: Yes */ #include "script_component.hpp" +if !(hasInterface) exitWith {}; GVAR(EffectsActive) = false; GVAR(PostProcess) ppEffectEnable false; diff --git a/addons/grenades/functions/fnc_flashbangExplosionEH.sqf b/addons/grenades/functions/fnc_flashbangExplosionEH.sqf index cd85c3fe36..1f7e97c47a 100644 --- a/addons/grenades/functions/fnc_flashbangExplosionEH.sqf +++ b/addons/grenades/functions/fnc_flashbangExplosionEH.sqf @@ -94,7 +94,7 @@ _affected = _grenade nearEntities ["CAManBase", 20]; }, [_light], 0.1] call EFUNC(common,waitAndExecute); // blind player - if (_strength > 0.1) then { + if (_strength > 0.1 && hasInterface) then { GVAR(flashbangPPEffectCC) ppEffectEnable true; GVAR(flashbangPPEffectCC) ppEffectAdjust [1,1,(0.8 + _strength) min 1,[1,1,1,0],[0,0,0,1],[0,0,0,0]]; GVAR(flashbangPPEffectCC) ppEffectCommit 0.01; diff --git a/addons/huntir/functions/fnc_cam.sqf b/addons/huntir/functions/fnc_cam.sqf index 9eb22b9fb5..441f092a81 100644 --- a/addons/huntir/functions/fnc_cam.sqf +++ b/addons/huntir/functions/fnc_cam.sqf @@ -13,6 +13,7 @@ */ #include "script_component.hpp" +if !(hasInterface) exitWith {}; params ["_huntIR"]; GVAR(huntIR) = _huntIR; diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf index e6f7837e24..8e671b3ce7 100644 --- a/addons/medical/XEH_postInit.sqf +++ b/addons/medical/XEH_postInit.sqf @@ -33,6 +33,8 @@ GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"]; // Initialize all effects +if (hasInterface) then { + _fnc_createEffect = { private "_effect"; params ["_type", "_layer", "_default"]; @@ -241,7 +243,7 @@ GVAR(lastHeartBeatSound) = ACE_time; }; }, 0, []] call CBA_fnc_addPerFrameHandler; - +}; ["SettingsInitialized", { if (GVAR(level) == 2) exitwith { diff --git a/addons/nightvision/XEH_postInitClient.sqf b/addons/nightvision/XEH_postInitClient.sqf index 2839f6e5f9..a3b8775427 100644 --- a/addons/nightvision/XEH_postInitClient.sqf +++ b/addons/nightvision/XEH_postInitClient.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -if (!hasInterface) exitWith {}; +if !(hasInterface) exitWith {}; GVAR(ppEffectBlur) = ppEffectCreate ["dynamicBlur", 1234]; GVAR(ppEffectBlur) ppEffectForceInNVG true; diff --git a/addons/nightvision/functions/fnc_blending.sqf b/addons/nightvision/functions/fnc_blending.sqf index 96e7f404a5..8b7ebdfe03 100644 --- a/addons/nightvision/functions/fnc_blending.sqf +++ b/addons/nightvision/functions/fnc_blending.sqf @@ -21,6 +21,8 @@ */ #include "script_component.hpp" +if !(hasInterface) exitWith {}; + private ["_vehicle", "_weapon", "_ammo", "_magazine", "_player"]; _vehicle = _this select 0; diff --git a/addons/nightvision/functions/fnc_changeNVGBrightness.sqf b/addons/nightvision/functions/fnc_changeNVGBrightness.sqf index 22f96ce9b1..514814431f 100644 --- a/addons/nightvision/functions/fnc_changeNVGBrightness.sqf +++ b/addons/nightvision/functions/fnc_changeNVGBrightness.sqf @@ -16,6 +16,7 @@ */ #include "script_component.hpp" +if !(hasInterface) exitWith {}; private ["_brightness"]; PARAMS_2(_player,_changeInBrightness); diff --git a/addons/nightvision/functions/fnc_updatePPEffects.sqf b/addons/nightvision/functions/fnc_updatePPEffects.sqf index 9906a440fc..7e86f48ca2 100644 --- a/addons/nightvision/functions/fnc_updatePPEffects.sqf +++ b/addons/nightvision/functions/fnc_updatePPEffects.sqf @@ -15,6 +15,8 @@ */ #include "script_component.hpp" +if !(hasInterface) exitWith {}; + private ["_currentVehicle", "_grainSetting", "_blurSetting", "_radBlurSetting", "_config", "_hmd", "_cameraView", "_turret"]; _currentVehicle = vehicle ACE_player; From b7e02da1ccbff7c46721a293bb8acfe856f8261b Mon Sep 17 00:00:00 2001 From: jokoho48 Date: Fri, 11 Sep 2015 16:58:26 +0200 Subject: [PATCH 11/35] remove if (!hasInterface) from PFH move ! in () --- addons/common/functions/fnc_blurScreen.sqf | 2 +- addons/explosives/XEH_postInit.sqf | 2 +- addons/flashlights/XEH_postInitClient.sqf | 2 +- addons/gforces/XEH_postInit.sqf | 2 +- addons/gforces/functions/fnc_pfhUpdateGForces.sqf | 2 -- addons/goggles/XEH_postInit.sqf | 2 +- addons/goggles/functions/fnc_applyDust.sqf | 1 - addons/goggles/functions/fnc_applyGlassesEffect.sqf | 1 - addons/goggles/functions/fnc_onEachFrame.sqf | 1 - addons/goggles/functions/fnc_removeGlassesEffect.sqf | 1 - addons/grenades/XEH_postInit.sqf | 2 +- addons/huntir/functions/fnc_cam.sqf | 2 +- addons/laserpointer/XEH_postInit.sqf | 2 +- addons/map/functions/fnc_blueForceTrackingModule.sqf | 2 +- addons/nightvision/XEH_postInitClient.sqf | 2 +- addons/nightvision/functions/fnc_blending.sqf | 2 +- addons/nightvision/functions/fnc_changeNVGBrightness.sqf | 2 +- addons/nightvision/functions/fnc_updatePPEffects.sqf | 2 +- addons/overheating/XEH_postInit.sqf | 2 +- addons/reload/XEH_postInit.sqf | 2 +- addons/scopes/XEH_postInit.sqf | 2 +- addons/sitting/XEH_clientInit.sqf | 2 +- addons/spectator/functions/fnc_setSpectator.sqf | 2 +- addons/spectator/functions/fnc_updateUnits.sqf | 2 +- addons/vehicles/XEH_postInit.sqf | 2 +- addons/weaponselect/XEH_postInit.sqf | 2 +- addons/winddeflection/XEH_postInit.sqf | 2 +- 27 files changed, 22 insertions(+), 28 deletions(-) diff --git a/addons/common/functions/fnc_blurScreen.sqf b/addons/common/functions/fnc_blurScreen.sqf index fd2964854d..e62cebc173 100644 --- a/addons/common/functions/fnc_blurScreen.sqf +++ b/addons/common/functions/fnc_blurScreen.sqf @@ -10,7 +10,7 @@ #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; private ["_show"]; PARAMS_1(_id); diff --git a/addons/explosives/XEH_postInit.sqf b/addons/explosives/XEH_postInit.sqf index 5216db8215..b6dc5049d9 100644 --- a/addons/explosives/XEH_postInit.sqf +++ b/addons/explosives/XEH_postInit.sqf @@ -29,7 +29,7 @@ if (isServer) then { }] call EFUNC(common,addEventHandler); }; -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; GVAR(PlacedCount) = 0; GVAR(Setup) = objNull; diff --git a/addons/flashlights/XEH_postInitClient.sqf b/addons/flashlights/XEH_postInitClient.sqf index 09cdcdd1f2..53e7d041a8 100644 --- a/addons/flashlights/XEH_postInitClient.sqf +++ b/addons/flashlights/XEH_postInitClient.sqf @@ -1,7 +1,7 @@ #include "script_component.hpp" // Exit on Headless as well -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; LOG(MSG_INIT); diff --git a/addons/gforces/XEH_postInit.sqf b/addons/gforces/XEH_postInit.sqf index 7a0d4a559c..a97822be8c 100644 --- a/addons/gforces/XEH_postInit.sqf +++ b/addons/gforces/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; // Setup ppEffect GVAR(GForces_CC) = ppEffectCreate ["ColorCorrections", 4215]; diff --git a/addons/gforces/functions/fnc_pfhUpdateGForces.sqf b/addons/gforces/functions/fnc_pfhUpdateGForces.sqf index 9692ecfcc7..55a41043b9 100644 --- a/addons/gforces/functions/fnc_pfhUpdateGForces.sqf +++ b/addons/gforces/functions/fnc_pfhUpdateGForces.sqf @@ -13,8 +13,6 @@ */ #include "script_component.hpp" -if !(hasInterface) exitWith {}; - private ["_interval", "_player", "_newVel", "_accel", "_currentGForce", "_average", "_sum", "_classCoef", "_suitCoef", "_gBlackOut", "_gRedOut", "_g", "_gBO", "_coef", "_strength"]; EXPLODE_2_PVT(_this,_params,_pfhId); diff --git a/addons/goggles/XEH_postInit.sqf b/addons/goggles/XEH_postInit.sqf index cd4a7591e7..088ccc477a 100644 --- a/addons/goggles/XEH_postInit.sqf +++ b/addons/goggles/XEH_postInit.sqf @@ -15,7 +15,7 @@ * Public: No */ #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; ["ACE3 Common", QGVAR(wipeGlasses), localize LSTRING(WipeGlasses), { diff --git a/addons/goggles/functions/fnc_applyDust.sqf b/addons/goggles/functions/fnc_applyDust.sqf index ab9abf5e7c..a1ac88c78d 100644 --- a/addons/goggles/functions/fnc_applyDust.sqf +++ b/addons/goggles/functions/fnc_applyDust.sqf @@ -15,7 +15,6 @@ */ #include "script_component.hpp" -if !(hasInterface) exitWith {}; if (call FUNC(ExternalCamera)) exitWith {}; if ([ace_player] call FUNC(isGogglesVisible)) exitWith { 100 cutRsc["RscACE_GogglesEffects", "PLAIN",2,false]; diff --git a/addons/goggles/functions/fnc_applyGlassesEffect.sqf b/addons/goggles/functions/fnc_applyGlassesEffect.sqf index 2dff54b345..7abb10d448 100644 --- a/addons/goggles/functions/fnc_applyGlassesEffect.sqf +++ b/addons/goggles/functions/fnc_applyGlassesEffect.sqf @@ -16,7 +16,6 @@ * Public: No */ #include "script_component.hpp" -if !(hasInterface) exitWith {}; private["_postProcessColour", "_postProcessTintAmount", "_glassesClassname", "_glassImagePath"]; diff --git a/addons/goggles/functions/fnc_onEachFrame.sqf b/addons/goggles/functions/fnc_onEachFrame.sqf index b2606e6c72..863046da7f 100644 --- a/addons/goggles/functions/fnc_onEachFrame.sqf +++ b/addons/goggles/functions/fnc_onEachFrame.sqf @@ -14,7 +14,6 @@ * Public: No */ #include "script_component.hpp" -if !(hasInterface) exitWith {}; if (isNull(ace_player)) exitWith {}; GVAR(FrameEvent) set [0, !(GVAR(FrameEvent) select 0)]; if (GVAR(FrameEvent) select 0) exitWith { diff --git a/addons/goggles/functions/fnc_removeGlassesEffect.sqf b/addons/goggles/functions/fnc_removeGlassesEffect.sqf index f587593b30..c7965fefbc 100644 --- a/addons/goggles/functions/fnc_removeGlassesEffect.sqf +++ b/addons/goggles/functions/fnc_removeGlassesEffect.sqf @@ -15,7 +15,6 @@ * Public: Yes */ #include "script_component.hpp" -if !(hasInterface) exitWith {}; GVAR(EffectsActive) = false; GVAR(PostProcess) ppEffectEnable false; diff --git a/addons/grenades/XEH_postInit.sqf b/addons/grenades/XEH_postInit.sqf index e78f1d52de..260bf63f6e 100644 --- a/addons/grenades/XEH_postInit.sqf +++ b/addons/grenades/XEH_postInit.sqf @@ -4,7 +4,7 @@ ["flashbangExplosion", DFUNC(flashbangExplosionEH)] call EFUNC(common,addEventHandler); -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; GVAR(flashbangPPEffectCC) = ppEffectCreate ["ColorCorrections", 4265]; GVAR(flashbangPPEffectCC) ppEffectForceInNVG true; diff --git a/addons/huntir/functions/fnc_cam.sqf b/addons/huntir/functions/fnc_cam.sqf index 441f092a81..9426de13fd 100644 --- a/addons/huntir/functions/fnc_cam.sqf +++ b/addons/huntir/functions/fnc_cam.sqf @@ -13,7 +13,7 @@ */ #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; params ["_huntIR"]; GVAR(huntIR) = _huntIR; diff --git a/addons/laserpointer/XEH_postInit.sqf b/addons/laserpointer/XEH_postInit.sqf index 6e9d402529..c478fe33fd 100644 --- a/addons/laserpointer/XEH_postInit.sqf +++ b/addons/laserpointer/XEH_postInit.sqf @@ -4,7 +4,7 @@ // fixes laser when being captured. Needed, because the selectionPosition of the right hand is used ["SetHandcuffed", {if (_this select 1) then {(_this select 0) action ["GunLightOff", _this select 0]};}] call EFUNC(common,addEventHandler); -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; GVAR(nearUnits) = []; diff --git a/addons/map/functions/fnc_blueForceTrackingModule.sqf b/addons/map/functions/fnc_blueForceTrackingModule.sqf index bab776c9ab..a789c6aa8c 100644 --- a/addons/map/functions/fnc_blueForceTrackingModule.sqf +++ b/addons/map/functions/fnc_blueForceTrackingModule.sqf @@ -12,7 +12,7 @@ #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; PARAMS_3(_logic,_units,_activated); diff --git a/addons/nightvision/XEH_postInitClient.sqf b/addons/nightvision/XEH_postInitClient.sqf index a3b8775427..2839f6e5f9 100644 --- a/addons/nightvision/XEH_postInitClient.sqf +++ b/addons/nightvision/XEH_postInitClient.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; GVAR(ppEffectBlur) = ppEffectCreate ["dynamicBlur", 1234]; GVAR(ppEffectBlur) ppEffectForceInNVG true; diff --git a/addons/nightvision/functions/fnc_blending.sqf b/addons/nightvision/functions/fnc_blending.sqf index 8b7ebdfe03..8c49711079 100644 --- a/addons/nightvision/functions/fnc_blending.sqf +++ b/addons/nightvision/functions/fnc_blending.sqf @@ -21,7 +21,7 @@ */ #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; private ["_vehicle", "_weapon", "_ammo", "_magazine", "_player"]; diff --git a/addons/nightvision/functions/fnc_changeNVGBrightness.sqf b/addons/nightvision/functions/fnc_changeNVGBrightness.sqf index 514814431f..a55535e40a 100644 --- a/addons/nightvision/functions/fnc_changeNVGBrightness.sqf +++ b/addons/nightvision/functions/fnc_changeNVGBrightness.sqf @@ -16,7 +16,7 @@ */ #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; private ["_brightness"]; PARAMS_2(_player,_changeInBrightness); diff --git a/addons/nightvision/functions/fnc_updatePPEffects.sqf b/addons/nightvision/functions/fnc_updatePPEffects.sqf index 7e86f48ca2..72cd6cbd0d 100644 --- a/addons/nightvision/functions/fnc_updatePPEffects.sqf +++ b/addons/nightvision/functions/fnc_updatePPEffects.sqf @@ -15,7 +15,7 @@ */ #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; private ["_currentVehicle", "_grainSetting", "_blurSetting", "_radBlurSetting", "_config", "_hmd", "_cameraView", "_turret"]; diff --git a/addons/overheating/XEH_postInit.sqf b/addons/overheating/XEH_postInit.sqf index 0dad0dd32c..51f23bf0b6 100644 --- a/addons/overheating/XEH_postInit.sqf +++ b/addons/overheating/XEH_postInit.sqf @@ -1,7 +1,7 @@ // by esteldunedain #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; // Add keybinds ["ACE3 Weapons", QGVAR(unjamWeapon), localize LSTRING(UnjamWeapon), diff --git a/addons/reload/XEH_postInit.sqf b/addons/reload/XEH_postInit.sqf index 9d5110d330..991eb67f36 100644 --- a/addons/reload/XEH_postInit.sqf +++ b/addons/reload/XEH_postInit.sqf @@ -1,7 +1,7 @@ // by esteldunedain #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; // Add keybinds ["ACE3 Weapons", QGVAR(checkAmmo), localize LSTRING(checkAmmo), diff --git a/addons/scopes/XEH_postInit.sqf b/addons/scopes/XEH_postInit.sqf index e96ac43960..1f56aecefb 100644 --- a/addons/scopes/XEH_postInit.sqf +++ b/addons/scopes/XEH_postInit.sqf @@ -7,7 +7,7 @@ */ #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; // Check inventory when it changes ["playerInventoryChanged", { diff --git a/addons/sitting/XEH_clientInit.sqf b/addons/sitting/XEH_clientInit.sqf index 1e477cd952..9cf8278877 100644 --- a/addons/sitting/XEH_clientInit.sqf +++ b/addons/sitting/XEH_clientInit.sqf @@ -1,7 +1,7 @@ #include "script_component.hpp" // Exit on Headless -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; // Add interaction menu exception ["isNotSitting", {!((_this select 0) getVariable [QGVAR(isSitting), false])}] call EFUNC(common,addCanInteractWithCondition); diff --git a/addons/spectator/functions/fnc_setSpectator.sqf b/addons/spectator/functions/fnc_setSpectator.sqf index 621100a5ba..192d8687cd 100644 --- a/addons/spectator/functions/fnc_setSpectator.sqf +++ b/addons/spectator/functions/fnc_setSpectator.sqf @@ -23,7 +23,7 @@ params [["_set",true,[true]]]; // Only clients can be spectators -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; // Exit if no change if (_set isEqualTo GVAR(isSet)) exitwith {}; diff --git a/addons/spectator/functions/fnc_updateUnits.sqf b/addons/spectator/functions/fnc_updateUnits.sqf index 50494cf499..0297b31b8d 100644 --- a/addons/spectator/functions/fnc_updateUnits.sqf +++ b/addons/spectator/functions/fnc_updateUnits.sqf @@ -20,7 +20,7 @@ params [["_newUnits",[],[[]]],["_blacklist",false,[false]]]; // Function only matters on player clients -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; // If adding to a list we can exit here, since it won't show up until the UI refreshes anyway if !(_newUnits isEqualTo []) exitWith { diff --git a/addons/vehicles/XEH_postInit.sqf b/addons/vehicles/XEH_postInit.sqf index 253f5eab39..a8ec2fb75f 100644 --- a/addons/vehicles/XEH_postInit.sqf +++ b/addons/vehicles/XEH_postInit.sqf @@ -1,7 +1,7 @@ // by esteldunedain #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; // Add keybinds ["ACE3 Vehicles", QGVAR(speedLimiter), localize LSTRING(SpeedLimiter), diff --git a/addons/weaponselect/XEH_postInit.sqf b/addons/weaponselect/XEH_postInit.sqf index d2bfb55236..3da7fda785 100644 --- a/addons/weaponselect/XEH_postInit.sqf +++ b/addons/weaponselect/XEH_postInit.sqf @@ -1,7 +1,7 @@ // by esteldunedain #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; // Add keybinds ["ACE3 Weapons", QGVAR(SelectPistolNew), localize LSTRING(SelectPistol), diff --git a/addons/winddeflection/XEH_postInit.sqf b/addons/winddeflection/XEH_postInit.sqf index 63d866fb60..ff9e2427f4 100644 --- a/addons/winddeflection/XEH_postInit.sqf +++ b/addons/winddeflection/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -if !(hasInterface) exitWith {}; +if (!hasInterface) exitWith {}; GVAR(trackedBullets) = []; From 9748abdb48c55208124584c5ece4bbeaff7cb8a1 Mon Sep 17 00:00:00 2001 From: bux578 Date: Sat, 12 Sep 2015 10:58:29 +0200 Subject: [PATCH 12/35] change order of BloodPressure readout, fix #2400 --- addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf b/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf index 9d061460fe..24b5bf4c6e 100644 --- a/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf +++ b/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf @@ -22,7 +22,7 @@ _bloodPressure = if (!alive _target) then { } else { [_target] call FUNC(getBloodPressure) }; -_bloodPressure params ["_bloodPressureHigh", "_bloodPressureLow"]; +_bloodPressure params [ "_bloodPressureLow", "_bloodPressureHigh"]; _output = ""; _logOutPut = ""; if ([_caller] call FUNC(isMedic)) then { From e6c2916a1455ff28135496d46bcacbf2830b60f8 Mon Sep 17 00:00:00 2001 From: SilentSpike Date: Sat, 12 Sep 2015 13:42:31 +0100 Subject: [PATCH 13/35] Fix spectator template for negligible respawnDelay When the value of respawn delay is 0 the timing of the killed and respawn events can be a little strange and result in spectator being entered but never exited. The respawn template should just do nothing when the delay is so small. --- addons/spectator/functions/fnc_respawnTemplate.sqf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/spectator/functions/fnc_respawnTemplate.sqf b/addons/spectator/functions/fnc_respawnTemplate.sqf index b808c43eab..d903e3ecc4 100644 --- a/addons/spectator/functions/fnc_respawnTemplate.sqf +++ b/addons/spectator/functions/fnc_respawnTemplate.sqf @@ -21,15 +21,17 @@ params [["_unit",objNull,[objNull]], ["_killer",objNull,[objNull]], ["_respawn",0,[0]], ["_respawnDelay",0,[0]]]; private ["_vision","_pos"]; -// End mission when all are dead with respawn type "None" +// When all are dead with respawn type "None" the mission should end if ((_respawn == 0) && {{alive _x} count allPlayers <= 0}) exitWith { [["endDeath",false],"BIS_fnc_endMission"] call EFUNC(common,execRemoteFnc); }; +// Some environment information can be used for the initial camera attributes if (isNull _killer) then {_killer = _unit}; _vision = [-2,-1] select (sunOrMoon < 1); _pos = (getPosATL _unit) vectorAdd [0,0,5]; +// Enter/exit spectator based on the respawn type and whether killed/respawned if (alive _unit) then { if (_respawn == 1) then { [_unit,QGVAR(isSeagull)] call EFUNC(common,hideUnit); @@ -39,6 +41,9 @@ if (alive _unit) then { [false] call FUNC(setSpectator); }; } else { + // Negligible respawn delay can result in entering spectator after respawn + if (playerRespawnTime <= 1) exitWith {}; + [2,_killer,_vision,_pos,getDir _unit] call FUNC(setCameraAttributes); [true] call FUNC(setSpectator); }; From 7c846502b57109569a226849c74ecd126797eb5b Mon Sep 17 00:00:00 2001 From: SilentSpike Date: Sat, 12 Sep 2015 13:36:55 +0100 Subject: [PATCH 14/35] Reset captive status on respawn for reliability Previously we were resetting on death, but this caused problems when the respawnDelay was 0 as the dead unit wasn't actually the player. To account for "group" and "side" respawn types where you change unit on respawn and could potentially become a captive unit, I am explicity checking the mission respawn type before resetting variables. --- addons/captives/CfgEventHandlers.hpp | 8 ----- .../captives/functions/fnc_handleKilled.sqf | 32 ----------------- .../captives/functions/fnc_handleRespawn.sqf | 36 +++++++++++++------ 3 files changed, 25 insertions(+), 51 deletions(-) delete mode 100644 addons/captives/functions/fnc_handleKilled.sqf diff --git a/addons/captives/CfgEventHandlers.hpp b/addons/captives/CfgEventHandlers.hpp index 9d1a69f4fd..4d12dc10c4 100644 --- a/addons/captives/CfgEventHandlers.hpp +++ b/addons/captives/CfgEventHandlers.hpp @@ -25,14 +25,6 @@ class Extended_GetOut_EventHandlers { }; }; }; -//reset captivity and escorting status when getting killed -class Extended_Killed_EventHandlers { - class CAManBase { - class GVAR(AutoDetachCaptive) { - killed = QUOTE(_this call FUNC(handleKilled)); - }; - }; -}; //mission start class Extended_InitPost_EventHandlers { class CAManBase { diff --git a/addons/captives/functions/fnc_handleKilled.sqf b/addons/captives/functions/fnc_handleKilled.sqf deleted file mode 100644 index f7b15ec117..0000000000 --- a/addons/captives/functions/fnc_handleKilled.sqf +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Author: PabstMirror - * Handles when a unit is kill. Reset captivity and escorting status - * - * Arguments: - * 0: _oldUnit - * - * Return Value: - * None - * - * Example: - * [bob1] call ACE_captives_fnc_handleKilled - * - * Public: No - */ -#include "script_component.hpp" - -params ["_oldUnit"]; - -if (!local _oldUnit) exitWith {}; - -if (_oldUnit getVariable [QGVAR(isHandcuffed), false]) then { - [_oldUnit, false] call FUNC(setHandcuffed); -}; - -if (_oldUnit getVariable [QGVAR(isEscorting), false]) then { - _oldUnit setVariable [QGVAR(isEscorting), false, true]; -}; - -if (_oldUnit getVariable [QGVAR(isSurrendering), false]) then { - [_oldUnit, false] call FUNC(setSurrendered); -}; diff --git a/addons/captives/functions/fnc_handleRespawn.sqf b/addons/captives/functions/fnc_handleRespawn.sqf index 6f68aea2fe..7e97501576 100644 --- a/addons/captives/functions/fnc_handleRespawn.sqf +++ b/addons/captives/functions/fnc_handleRespawn.sqf @@ -20,20 +20,34 @@ params ["_unit","_dead"]; if (!local _unit) exitWith {}; -//With respawn="group", we could be respawning into a unit that is handcuffed/captive -//If they are, reset and rerun the SET function -//if not, make sure to explicity disable the setCaptivityStatus, because captiveNum does not work correctly on respawn +// Group and side respawn can potentially respawn you as a captive unit +// Base and instant respawn cannot, so captive should be entirely reset +// So we explicity account for the respawn type +private ["_respawn"]; +_respawn = [0] call BIS_fnc_missionRespawnType; -if (_unit getVariable [QGVAR(isHandcuffed), false]) then { - _unit setVariable [QGVAR(isHandcuffed), false]; - [_unit, true] call FUNC(setHandcuffed); +if (_respawn > 3) then { + if (_unit getVariable [QGVAR(isHandcuffed), false]) then { + _unit setVariable [QGVAR(isHandcuffed), false]; + [_unit, true] call FUNC(setHandcuffed); + }; + + if (_unit getVariable [QGVAR(isSurrendering), false]) then { + _unit setVariable [QGVAR(isSurrendering), false]; + [_unit, true] call FUNC(setSurrendered); + }; } else { + if (_unit getVariable [QGVAR(isHandcuffed), false]) then { + [_unit, false] call FUNC(setHandcuffed); + }; [_unit, QGVAR(Handcuffed), false] call EFUNC(common,setCaptivityStatus); -}; -if (_unit getVariable [QGVAR(isSurrendering), false]) then { - _unit setVariable [QGVAR(isSurrendering), false]; - [_unit, true] call FUNC(setSurrendered); -} else { + if (_unit getVariable [QGVAR(isSurrendering), false]) then { + [_unit, false] call FUNC(setSurrendered); + }; [_unit, QGVAR(Surrendered), false] call EFUNC(common,setCaptivityStatus); + + if (_oldUnit getVariable [QGVAR(isEscorting), false]) then { + _oldUnit setVariable [QGVAR(isEscorting), false, true]; + }; }; From 5feee53c698aabf446e6b62ec1130c0980a4c312 Mon Sep 17 00:00:00 2001 From: jokoho48 Date: Sat, 12 Sep 2015 18:12:57 +0200 Subject: [PATCH 15/35] Posible fix for #2407 --- addons/microdagr/functions/fnc_appWaypointsButtonDeleteWP.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/microdagr/functions/fnc_appWaypointsButtonDeleteWP.sqf b/addons/microdagr/functions/fnc_appWaypointsButtonDeleteWP.sqf index 956e24c5ba..d1fe1e8bdd 100644 --- a/addons/microdagr/functions/fnc_appWaypointsButtonDeleteWP.sqf +++ b/addons/microdagr/functions/fnc_appWaypointsButtonDeleteWP.sqf @@ -18,7 +18,7 @@ private ["_display", "_wpIndex"]; disableSerialization; -_display = uiNamespace getVariable [[QGVAR(RscTitleDisplay), QGVAR(DialogDisplay)] select GVAR(currentShowMode) == DISPLAY_MODE_DIALOG, displayNull]; +_display = uiNamespace getVariable [[QGVAR(RscTitleDisplay), QGVAR(DialogDisplay)] select (GVAR(currentShowMode) == DISPLAY_MODE_DIALOG), displayNull]; if (isNull _display) exitWith {ERROR("No Display");}; From 530dfa041d2bfacb07f858210e6d5ba1a9b62f72 Mon Sep 17 00:00:00 2001 From: gienkov Date: Sat, 12 Sep 2015 21:25:02 +0200 Subject: [PATCH 16/35] stringtable DAGR --- addons/dagr/CfgVehicles.hpp | 6 +++--- addons/dagr/CfgWeapons.hpp | 4 ++-- addons/dagr/stringtable.xml | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/addons/dagr/CfgVehicles.hpp b/addons/dagr/CfgVehicles.hpp index a9948ca8aa..7f0a7f6cff 100644 --- a/addons/dagr/CfgVehicles.hpp +++ b/addons/dagr/CfgVehicles.hpp @@ -4,7 +4,7 @@ class CfgVehicles { class ACE_SelfActions { class ACE_Equipment { class GVAR(menu) { - displayName = "Configure DAGR"; + displayName = CSTRING(ConfigureDAGR); condition = QUOTE([ARR_2(_player,'ACE_DAGR')] call EFUNC(common,hasItem)); statement = QUOTE(call FUNC(menuInit)); showDisabled = 0; @@ -12,7 +12,7 @@ class CfgVehicles { icon = QUOTE(PATHTOF(UI\DAGR_Icon.paa)); exceptions[] = {"isNotInside", "isNotSitting"}; class GVAR(toggle) { - displayName = "Toggle DAGR"; + displayName = CSTRING(ToggleDAGR); condition = QUOTE([ARR_2(_player,'ACE_DAGR')] call EFUNC(common,hasItem)); statement = QUOTE(call FUNC(toggleOverlay)); showDisabled = 0; @@ -30,7 +30,7 @@ class CfgVehicles { author[] = {"Rosuto", "Ruthberg"}; scope = 2; scopeCurator = 2; - displayName = "DAGR"; + displayName = CSTRING(Name); vehicleClass = "Items"; class TransportItems { MACRO_ADDITEM(ACE_DAGR,1); diff --git a/addons/dagr/CfgWeapons.hpp b/addons/dagr/CfgWeapons.hpp index 830e9cf115..9fcd903cdd 100644 --- a/addons/dagr/CfgWeapons.hpp +++ b/addons/dagr/CfgWeapons.hpp @@ -6,9 +6,9 @@ class CfgWeapons { class ACE_DAGR: ACE_ItemCore { author[] = {$STR_ACE_Common_ACETeam, "Ruthberg"}; scope = 2; - displayName = "DAGR"; + displayName = CSTRING(Name); model = QUOTE(PATHTOF(data\DAGR.p3d)); - descriptionShort = ""; + descriptionShort = CSTRING(Description); picture = PATHTOF(UI\DAGR_Icon.paa); icon = "iconObject_circle"; mapSize = 0.034; diff --git a/addons/dagr/stringtable.xml b/addons/dagr/stringtable.xml index 7da844d614..77502f271b 100644 --- a/addons/dagr/stringtable.xml +++ b/addons/dagr/stringtable.xml @@ -1,5 +1,21 @@  + + DAGR + DAGR + + + Configure DAGR + Konfiguruj DAGR + + + Toggle DAGR + Przełącz DAGR + + + Defense Advanced GPS Receiver + Defense Advanced GPS Receiver + \ No newline at end of file From fb75f6ad9e4dd640554c97edc32e18787ced97ce Mon Sep 17 00:00:00 2001 From: jokoho48 Date: Sun, 13 Sep 2015 18:57:07 +0200 Subject: [PATCH 17/35] Fix Bandage Texture Path and UV --- addons/medical/data/bandage.p3d | Bin 31328 -> 31052 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/addons/medical/data/bandage.p3d b/addons/medical/data/bandage.p3d index 28c727e84209bb96191fb11914d446b0e06d89bc..23540f10d99093ee770d100be01679b50769600e 100644 GIT binary patch literal 31052 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≀- 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 Z8I$S%d*UY$Ba$a-e#%I^H2?0D{{nBet)c(` literal 31328 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 From 032dd6c87c60443ce6629de9fc07086bde21aa80 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Mon, 14 Sep 2015 15:18:56 +0200 Subject: [PATCH 18/35] Tweaked visual effects. --- addons/medical/XEH_postInit.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf index e6f7837e24..00fa45744c 100644 --- a/addons/medical/XEH_postInit.sqf +++ b/addons/medical/XEH_postInit.sqf @@ -159,7 +159,7 @@ GVAR(lastHeartBeatSound) = ACE_time; _heartRate = 60 + 40 * _pain; }; if (_heartRate <= 0) exitwith {}; - _interval = 60 / (_heartRate min 50); + _interval = 60 / (_heartRate min 40); if ((ACE_player getVariable ["ACE_isUnconscious", false])) then { if (GVAR(painEffectType) == 1) then { @@ -173,7 +173,7 @@ GVAR(lastHeartBeatSound) = ACE_time; // Pain effect, no pain effect in zeus camera if (isNull curatorCamera) then { - _strength = (_pain - (ACE_player getvariable [QGVAR(painSuppress), 0])) max 0; + _strength = ((_pain - (ACE_player getvariable [QGVAR(painSuppress), 0])) max 0) min 1; _strength = _strength * (ACE_player getVariable [QGVAR(painCoefficient), GVAR(painCoefficient)]); if (GVAR(painEffectType) == 1) then { GVAR(effectPainCC) ppEffectEnable false; From 6d4744b9ea4ea8cb1a04b8719370941d1bea369f Mon Sep 17 00:00:00 2001 From: Glowbal Date: Mon, 14 Sep 2015 15:19:18 +0200 Subject: [PATCH 19/35] Increased duration of knock down for basic medical --- addons/medical/functions/fnc_handleDamage_basic.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_handleDamage_basic.sqf b/addons/medical/functions/fnc_handleDamage_basic.sqf index 43b0852e1b..92fc97c717 100644 --- a/addons/medical/functions/fnc_handleDamage_basic.sqf +++ b/addons/medical/functions/fnc_handleDamage_basic.sqf @@ -36,7 +36,7 @@ TRACE_4("ACE_DEBUG: HandleDamage BASIC",_unit, _damageBodyParts,_cache_params,_c if (alive _unit && {!(_unit getvariable ["ACE_isUnconscious", false])}) then { // If it reaches this, we can assume that the hit did not kill this unit, as this function is called 3 frames after the damage has been passed. if ([_unit, _part, if (_part > 1) then {_newDamage * 1.3} else {_newDamage * 2}] call FUNC(determineIfFatal)) then { - [_unit, true, 0.5+random(3)] call FUNC(setUnconscious); + [_unit, true, 0.5+random(10)] call FUNC(setUnconscious); }; }; _pain = _unit getVariable [QGVAR(pain), 0]; From 37639066c26d3e4f0b88e0d00750772ba4b92771 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Mon, 14 Sep 2015 15:19:58 +0200 Subject: [PATCH 20/35] Include missing frame in the caching execution --- addons/medical/functions/fnc_handleDamage_caching.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_handleDamage_caching.sqf b/addons/medical/functions/fnc_handleDamage_caching.sqf index 41f93b954b..910221a850 100644 --- a/addons/medical/functions/fnc_handleDamage_caching.sqf +++ b/addons/medical/functions/fnc_handleDamage_caching.sqf @@ -76,7 +76,7 @@ if (diag_frameno > (_unit getVariable [QGVAR(frameNo_damageCaching), -3]) + 2) t private ["_args", "_params"]; params ["_args", "_idPFH"]; _args params ["_unit", "_frameno"]; - if (diag_frameno > _frameno + 2) then { + if (diag_frameno >= _frameno + 2) then { _unit setDamage 0; if (GVAR(level) < 2 || {!([_unit] call FUNC(hasMedicalEnabled))}) then { From 8c60e769796a28e9516810b4ec0b5138b80da6bf Mon Sep 17 00:00:00 2001 From: Glowbal Date: Mon, 14 Sep 2015 21:13:58 +0200 Subject: [PATCH 21/35] Tweaks made to improve determine if fatal algorithm --- .../functions/fnc_determineIfFatal.sqf | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/addons/medical/functions/fnc_determineIfFatal.sqf b/addons/medical/functions/fnc_determineIfFatal.sqf index 10a64d79a6..7fc4823202 100644 --- a/addons/medical/functions/fnc_determineIfFatal.sqf +++ b/addons/medical/functions/fnc_determineIfFatal.sqf @@ -14,7 +14,15 @@ */ #include "script_component.hpp" -private ["_damageThreshold", "_damageBodyPart"]; +#define INCREASE_CHANCE_HEAD 0.05 +#define INCREASE_CHANCE_TORSO 0.03 +#define INCREASE_CHANGE_LIMB 0.01 + +#define CHANGE_FATAL_HEAD 0.7 +#define CHANGE_FATAL_TORSO 0.6 +#define CHANGE_FATAL_LIMB 0.1 + +private ["_damageThreshold", "_damageBodyPart", "_chanceFatal"]; params ["_unit", "_part", ["_withDamage", 0]]; if (!alive _unit) exitwith {true}; @@ -28,17 +36,22 @@ if ([_unit] call EFUNC(common,IsPlayer)) then { } else { _damageThreshold =_unit getvariable[QGVAR(unitDamageThreshold), [GVAR(AIDamageThreshold), GVAR(AIDamageThreshold), GVAR(AIDamageThreshold) * 1.7]]; }; +_damageThreshold params ["_thresholdHead", "_thresholdTorso", "_thresholdLimbs"]; _damageBodyPart = ((_unit getvariable [QGVAR(bodyPartStatus),[0, 0, 0, 0, 0, 0]]) select _part) + _withDamage; // Check if damage to body part is higher as damage head if (_part == 0) exitwith { - (_damageBodyPart >= (_damageThreshold select 0) && {(random(1) > 0.2)}); + _chanceFatal = CHANGE_FATAL_HEAD + ((INCREASE_CHANCE_HEAD * (_damageBodyPart - _thresholdHead)) * 10); + (_damageBodyPart >= _thresholdHead && {(_chanceFatal >= random(1))}); }; // Check if damage to body part is higher as damage torso if (_part == 1) exitwith { - (_damageBodyPart >= (_damageThreshold select 1) && {(random(1) > 0.35)}); + _chanceFatal = CHANGE_FATAL_TORSO + ((INCREASE_CHANCE_TORSO * (_damageBodyPart - _thresholdTorso)) * 10); + (_damageBodyPart >= _thresholdTorso && {(_chanceFatal >= random(1))}); }; // Check if damage to body part is higher as damage limbs -(_damageBodyPart >= (_damageThreshold select 2) && {(random(1) > 0.95)}); +// We use a slightly lower decrease for limbs, as we want any injuries done to those to be less likely to be fatal compared to head shots or torso. +_chanceFatal = CHANGE_FATAL_LIMB + ((INCREASE_CHANGE_LIMB * (_damageBodyPart - _thresholdLimbs)) * 10); +(_damageBodyPart >= _thresholdLimbs && {(_chanceFatal >= random(1))}); From 33ac78dbacfedf80d495210a1d78ef859686cc18 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Mon, 14 Sep 2015 21:14:56 +0200 Subject: [PATCH 22/35] Addresses the large amount of bandages required in basic medical This should restore the bandaging behavior back to how it is before the adjustments made to basic medical --- .../functions/fnc_treatmentBasic_bandageLocal.sqf | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_treatmentBasic_bandageLocal.sqf b/addons/medical/functions/fnc_treatmentBasic_bandageLocal.sqf index 37c9f3ef15..0f2d283224 100644 --- a/addons/medical/functions/fnc_treatmentBasic_bandageLocal.sqf +++ b/addons/medical/functions/fnc_treatmentBasic_bandageLocal.sqf @@ -25,7 +25,14 @@ _part = [_selectionName] call FUNC(selectionNameToNumber); if (_part < 0) exitwith {false}; if ((_damageBodyParts select _part) > 0) then { - _damageBodyParts set [_part, ((_damageBodyParts select _part) - BANDAGEHEAL) max 0]; + _damageOnPart = (_damageBodyParts select _part); + // Temp quick fix to change in behaviour of basic medical bandaging + if (_damageOnPart - BANDAGEHEAL > 0) then { + _damageOnPart = _damageOnPart * BANDAGEHEAL; + } else { + _damageOnPart = _damageOnPart - BANDAGEHEAL; + }; + _damageBodyParts set [_part, _damageOnPart max 0]; _target setvariable [QGVAR(bodyPartStatus), _damageBodyParts, true]; TRACE_2("ACE_DEBUG: Treatment BASIC Bandage Broadcast value here",_unit, _target getvariable QGVAR(bodyPartStatus)); }; From 10ac127159fdb39dad349ffc886afafa57e6d754 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Mon, 14 Sep 2015 21:15:57 +0200 Subject: [PATCH 23/35] Fixed incorrect new damage value in handleDamage advanced. The new handleDamage from BI added a new value to the parameters that we didn't account for in handleDamage advanced. --- addons/medical/functions/fnc_handleDamage_advanced.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_handleDamage_advanced.sqf b/addons/medical/functions/fnc_handleDamage_advanced.sqf index 214d291e86..5035fbe282 100644 --- a/addons/medical/functions/fnc_handleDamage_advanced.sqf +++ b/addons/medical/functions/fnc_handleDamage_advanced.sqf @@ -20,7 +20,7 @@ #include "script_component.hpp" private ["_typeOfProjectile", "_part", "_damageBodyParts", "_hitPoints"]; -params ["_unit", "_selectionName", "_amountOfDamage", "_sourceOfDamage", "_typeOfProjectile", "_newDamage"]; +params ["_unit", "_selectionName", "_amountOfDamage", "_sourceOfDamage", "_typeOfProjectile", "_hitPointNumber", "_newDamage"]; _part = [_selectionName] call FUNC(selectionNameToNumber); if (_part < 0) exitwith {}; From f7bd557a307f4c8de4f511538bf4acdff2f8d2d3 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 14 Sep 2015 16:11:38 -0500 Subject: [PATCH 24/35] Fix some stringtable weirdness --- addons/hearing/stringtable.xml | 5 +---- addons/optionsmenu/stringtable.xml | 6 ------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/addons/hearing/stringtable.xml b/addons/hearing/stringtable.xml index f8585d2191..e1cb820665 100644 --- a/addons/hearing/stringtable.xml +++ b/addons/hearing/stringtable.xml @@ -140,12 +140,9 @@ Ativar surdez em combate? - Activer la surdité au combat? + Controls combat deafness and ear ringing. When activated, players can be deafened when a gun is fired in their vicinity or an explosion takes place without hearing protection Harci süketség engedélyezése? Уменьшает способность игроков слышать при повреждении слуха - - - Controls combat deafness and ear ringing. When activated, players can be deafened when a gun is fired in their vicinity or an explosion takes place without hearing protection Głuchota bojowa pojawia się w momentach, kiedy stoimy w pobliżu broni wielkokalibrowej bez ochrony słuchu, lub np. podczas ostrzału artyleryjskiego. Moduł ten pozwala na włączenie lub wyłączenie tego efektu. Dieses Modul aktiviert/deaktiviert die Taubheit im Gefecht. Wenn aktiviert, können Spieler ohne Gehörschutz taub werden, wenn eine Waffe in ihrer Nähe abgefeuert wird oder eine Explosion stattfindet. Ztráta sluchu je možná ve chvíly, kdy se v bezprostřední blízkosti střílí z velkorážní zbraně nebo při bombardování a osoba je bez ochrany sluchu (např. špunty). Tento modul umožňuje tuto věc povolit nebo zakázat. diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml index f066531927..6ed27e0645 100644 --- a/addons/optionsmenu/stringtable.xml +++ b/addons/optionsmenu/stringtable.xml @@ -356,12 +356,6 @@ Pošle debug informace do RPT a schránky. Protokolliert Debug-Informationen im RPT und speichert sie in der Zwischenablage. Envia informação de depuração para RPT e área de transferência. - - - Headbug Fix - - - Resets your animation state. Copie le Debug dans le RPT et le presse papier Debug információt küld az RPT-be és a vágólapra. Отправляет отладочную информацию в RPT и буфер обмена. From 7b7ad6eea8b28fd6b3d2fac5b8dde2417d1ccae6 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Mon, 14 Sep 2015 23:18:20 +0200 Subject: [PATCH 25/35] fixed tweak to basic bandage --- addons/medical/functions/fnc_treatmentBasic_bandageLocal.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_treatmentBasic_bandageLocal.sqf b/addons/medical/functions/fnc_treatmentBasic_bandageLocal.sqf index 0f2d283224..ee04decfbd 100644 --- a/addons/medical/functions/fnc_treatmentBasic_bandageLocal.sqf +++ b/addons/medical/functions/fnc_treatmentBasic_bandageLocal.sqf @@ -28,7 +28,7 @@ if ((_damageBodyParts select _part) > 0) then { _damageOnPart = (_damageBodyParts select _part); // Temp quick fix to change in behaviour of basic medical bandaging if (_damageOnPart - BANDAGEHEAL > 0) then { - _damageOnPart = _damageOnPart * BANDAGEHEAL; + _damageOnPart = _damageOnPart - (_damageOnPart * BANDAGEHEAL); } else { _damageOnPart = _damageOnPart - BANDAGEHEAL; }; From e029e8318f86e4935cf3a4654174ddb582853cf2 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 14 Sep 2015 16:37:39 -0500 Subject: [PATCH 26/35] microDagr - Add ability to access draw event for minimap --- addons/microdagr/XEH_clientInit.sqf | 3 +++ addons/microdagr/functions/fnc_mapOnDrawEH.sqf | 3 +++ 2 files changed, 6 insertions(+) diff --git a/addons/microdagr/XEH_clientInit.sqf b/addons/microdagr/XEH_clientInit.sqf index c918bcf454..518a648601 100644 --- a/addons/microdagr/XEH_clientInit.sqf +++ b/addons/microdagr/XEH_clientInit.sqf @@ -3,6 +3,9 @@ if (!hasInterface) exitWith {}; +//Functions that are called for each draw of the map: +GVAR(miniMapDrawHandlers) = []; + //Add deviceKey entry: private ["_conditonCode", "_toggleCode", "_closeCode"]; _conditonCode = { diff --git a/addons/microdagr/functions/fnc_mapOnDrawEH.sqf b/addons/microdagr/functions/fnc_mapOnDrawEH.sqf index a74255601c..25f5bc92fd 100644 --- a/addons/microdagr/functions/fnc_mapOnDrawEH.sqf +++ b/addons/microdagr/functions/fnc_mapOnDrawEH.sqf @@ -48,6 +48,9 @@ if (GVAR(currentApplicationPage) == 1) then { }; } else { //Map Mode: + //Call all added minimap draw event handlers: + {_this call _x;} forEach GVAR(miniMapDrawHandlers); + if (GVAR(mapAutoTrackPosition)) then { _theMap ctrlMapAnimAdd [0, (GVAR(mapZoom)/_mapSize), (getPosASL ACE_player)]; ctrlMapAnimCommit _theMap; From 61cbe543eede09d08c4051d1bb69fa4d32c22a8f Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 14 Sep 2015 18:06:46 -0500 Subject: [PATCH 27/35] Fix #2432 - Don't check for null attached when mounted --- addons/attach/functions/fnc_canDetach.sqf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/attach/functions/fnc_canDetach.sqf b/addons/attach/functions/fnc_canDetach.sqf index 915295e6c9..d9796a5a5c 100644 --- a/addons/attach/functions/fnc_canDetach.sqf +++ b/addons/attach/functions/fnc_canDetach.sqf @@ -19,6 +19,8 @@ params ["_attachToVehicle", "_unit"]; TRACE_2("params",_attachToVehicle,_unit); +if ((vehicle _unit) != _unit) exitWith {false}; + _attachedList = _attachToVehicle getVariable [QGVAR(attached), []]; if ((count _attachedList) == 0) exitWith {false}; From f419762653811128f590b40186b89d900327b0d5 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 14 Sep 2015 23:33:32 -0500 Subject: [PATCH 28/35] Fix time of flight display --- .../functions/fnc_dev_buildTable.sqf | 2 +- .../fnc_rangeTablePreCalculatedValues.sqf | 242 +++++++++--------- 2 files changed, 122 insertions(+), 122 deletions(-) diff --git a/addons/mk6mortar/functions/fnc_dev_buildTable.sqf b/addons/mk6mortar/functions/fnc_dev_buildTable.sqf index 7a60e91e68..84184fcb51 100644 --- a/addons/mk6mortar/functions/fnc_dev_buildTable.sqf +++ b/addons/mk6mortar/functions/fnc_dev_buildTable.sqf @@ -36,13 +36,13 @@ while {_stillInRange} do { _stillInRange = false; } else { if (_airFriction == 0) then { - _result set [4, 0]; _result set [5, 0]; _result set [6, 0]; _result set [7, 0]; _result set [8, 0]; _result set [9, 0]; _result set [10, 0]; + _result set [11, 0]; }; if ((_result select 1) < 88) then { _outputArray pushBack [ diff --git a/addons/mk6mortar/functions/fnc_rangeTablePreCalculatedValues.sqf b/addons/mk6mortar/functions/fnc_rangeTablePreCalculatedValues.sqf index 6904403b55..db87cb6000 100644 --- a/addons/mk6mortar/functions/fnc_rangeTablePreCalculatedValues.sqf +++ b/addons/mk6mortar/functions/fnc_rangeTablePreCalculatedValues.sqf @@ -133,135 +133,135 @@ case ((abs(_muzzleVelocity - 200) < 0.00001) && {(abs(_airFriction - -0.0001) < }; case ((abs(_muzzleVelocity - 70) < 0.00001) && {(abs(_airFriction - 0) < 0.00001)}): { [ - ["100","1497","9","1.3","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["150","1445","14","1.3","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["200","1390","19","1.4","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["250","1333","26","1.4","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["300","1272","34","1.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["350","1204","45","1.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["400","1127","61","1.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["450","1028","91","2.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"] + ["100","1497","9","1.3","14.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["150","1445","14","1.3","14.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["200","1390","19","1.4","14.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["250","1333","26","1.4","13.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["300","1272","34","1.5","13.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["350","1204","45","1.6","13.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["400","1127","61","1.8","12.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["450","1028","91","2.1","12.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0"] ] }; case ((abs(_muzzleVelocity - 140) < 0.00001) && {(abs(_airFriction - 0) < 0.00001)}): { [ - ["150","1562","1","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["200","1549","1","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["250","1536","2","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["300","1523","2","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["350","1510","2","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["400","1497","3","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["450","1484","3","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["500","1471","3","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["550","1458","4","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["600","1445","4","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["650","1431","4","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["700","1418","5","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["750","1404","5","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["800","1390","6","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["850","1376","6","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["900","1362","6","0.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["950","1348","7","0.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1000","1333","7","0.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1050","1318","8","0.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1100","1303","9","0.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1150","1288","9","0.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1200","1272","10","0.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1250","1256","11","0.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1300","1239","12","0.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1350","1222","13","0.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1400","1205","13","0.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1450","1187","15","0.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1500","1168","16","0.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1550","1148","18","1.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1600","1127","19","1.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1650","1105","21","1.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1700","1082","24","1.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1750","1057","27","1.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1800","1029","31","1.3","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1850","997","37","1.4","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1900","960","46","1.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1950","912","63","1.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"] + ["150","1562","1","0.7","28.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["200","1549","1","0.7","28.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["250","1536","2","0.7","28.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["300","1523","2","0.7","28.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["350","1510","2","0.7","28.4","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["400","1497","3","0.7","28.4","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["450","1484","3","0.7","28.4","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["500","1471","3","0.7","28.3","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["550","1458","4","0.7","28.3","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["600","1445","4","0.7","28.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["650","1431","4","0.7","28.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["700","1418","5","0.7","28.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["750","1404","5","0.7","28.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["800","1390","6","0.7","27.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["850","1376","6","0.7","27.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["900","1362","6","0.8","27.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["950","1348","7","0.8","27.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1000","1333","7","0.8","27.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1050","1318","8","0.8","27.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1100","1303","9","0.8","27.3","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1150","1288","9","0.8","27.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1200","1272","10","0.8","27.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1250","1256","11","0.8","26.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1300","1239","12","0.8","26.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1350","1222","13","0.9","26.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1400","1205","13","0.9","26.4","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1450","1187","15","0.9","26.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1500","1168","16","0.9","26.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1550","1148","18","1.0","25.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1600","1127","19","1.0","25.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1650","1105","21","1.1","25.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1700","1082","24","1.1","24.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1750","1057","27","1.2","24.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1800","1029","31","1.3","24.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1850","997","37","1.4","23.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1900","960","46","1.6","23.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1950","912","63","1.9","22.3","0.0","0.0","0.0","0.0","0.0","0.0","0.0"] ] }; case ((abs(_muzzleVelocity - 200) < 0.00001) && {(abs(_airFriction - 0) < 0.00001)}): { [ - ["300","1563","0","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["350","1556","1","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["400","1550","1","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["450","1544","1","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["500","1537","1","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["550","1531","1","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["600","1525","1","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["650","1519","1","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["700","1512","1","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["750","1506","1","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["800","1499","1","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["850","1493","1","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["900","1487","1","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["950","1480","1","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1000","1474","2","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1050","1467","2","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1100","1461","2","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1150","1454","2","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1200","1448","2","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1250","1441","2","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1300","1435","2","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1350","1428","2","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1400","1422","2","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1450","1415","2","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1500","1408","2","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1550","1402","3","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1600","1395","3","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1650","1388","3","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1700","1381","3","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1750","1374","3","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1800","1367","3","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1850","1360","3","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1900","1353","3","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["1950","1346","4","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2000","1339","4","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2050","1332","4","0.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2100","1325","4","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2150","1317","4","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2200","1310","4","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2250","1302","4","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2300","1295","5","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2350","1287","5","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2400","1280","5","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2450","1272","5","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2500","1264","5","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2550","1256","5","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2600","1248","6","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2650","1240","6","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2700","1232","6","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2750","1223","6","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2800","1215","7","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2850","1206","7","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2900","1197","7","0.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["2950","1188","7","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3000","1179","8","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3050","1170","8","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3100","1160","8","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3150","1151","9","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3200","1141","9","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3250","1131","10","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3300","1120","10","0.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3350","1109","11","0.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3400","1098","11","0.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3450","1087","12","0.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3500","1075","13","0.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3550","1062","14","0.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3600","1049","15","0.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3650","1036","16","0.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3700","1021","17","0.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3750","1006","19","1.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3800","990","21","1.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3850","971","24","1.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3900","952","27","1.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["3950","929","32","1.4","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["4000","900","40","1.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], - ["4050","861","56","2.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"] + ["300","1563","0","0.5","40.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["350","1556","1","0.5","40.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["400","1550","1","0.5","40.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["450","1544","1","0.5","40.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["500","1537","1","0.5","40.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["550","1531","1","0.5","40.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["600","1525","1","0.5","40.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["650","1519","1","0.5","40.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["700","1512","1","0.5","40.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["750","1506","1","0.5","40.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["800","1499","1","0.5","40.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["850","1493","1","0.5","40.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["900","1487","1","0.5","40.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["950","1480","1","0.5","40.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1000","1474","2","0.5","40.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1050","1467","2","0.5","40.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1100","1461","2","0.5","40.4","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1150","1454","2","0.5","40.4","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1200","1448","2","0.5","40.3","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1250","1441","2","0.5","40.3","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1300","1435","2","0.5","40.3","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1350","1428","2","0.5","40.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1400","1422","2","0.5","40.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1450","1415","2","0.5","40.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1500","1408","2","0.5","40.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1550","1402","3","0.5","40.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1600","1395","3","0.5","40.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1650","1388","3","0.5","39.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1700","1381","3","0.5","39.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1750","1374","3","0.5","39.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1800","1367","3","0.5","39.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1850","1360","3","0.5","39.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1900","1353","3","0.5","39.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["1950","1346","4","0.5","39.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2000","1339","4","0.5","39.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2050","1332","4","0.5","39.4","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2100","1325","4","0.6","39.3","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2150","1317","4","0.6","39.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2200","1310","4","0.6","39.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2250","1302","4","0.6","39.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2300","1295","5","0.6","39.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2350","1287","5","0.6","38.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2400","1280","5","0.6","38.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2450","1272","5","0.6","38.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2500","1264","5","0.6","38.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2550","1256","5","0.6","38.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2600","1248","6","0.6","38.4","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2650","1240","6","0.6","38.3","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2700","1232","6","0.6","38.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2750","1223","6","0.6","38.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2800","1215","7","0.6","37.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2850","1206","7","0.6","37.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2900","1197","7","0.6","37.6","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["2950","1188","7","0.7","37.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3000","1179","8","0.7","37.4","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3050","1170","8","0.7","37.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3100","1160","8","0.7","37.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3150","1151","9","0.7","36.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3200","1141","9","0.7","36.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3250","1131","10","0.7","36.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3300","1120","10","0.7","36.3","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3350","1109","11","0.8","36.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3400","1098","11","0.8","35.9","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3450","1087","12","0.8","35.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3500","1075","13","0.8","35.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3550","1062","14","0.8","35.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3600","1049","15","0.9","35.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3650","1036","16","0.9","34.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3700","1021","17","0.9","34.4","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3750","1006","19","1.0","34.1","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3800","990","21","1.1","33.7","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3850","971","24","1.1","33.3","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3900","952","27","1.2","32.8","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["3950","929","32","1.4","32.2","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["4000","900","40","1.6","31.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"], + ["4050","861","56","2.1","30.5","0.0","0.0","0.0","0.0","0.0","0.0","0.0"] ] }; default { From 17fdce719657d26dd14ddc701317fb167cb1cb8e Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 15 Sep 2015 08:03:56 -0500 Subject: [PATCH 29/35] Cleanup preInit --- addons/captives/XEH_preInit.sqf | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/captives/XEH_preInit.sqf b/addons/captives/XEH_preInit.sqf index d2b5b615bb..b59249b937 100644 --- a/addons/captives/XEH_preInit.sqf +++ b/addons/captives/XEH_preInit.sqf @@ -19,7 +19,6 @@ PREP(doUnloadCaptive); PREP(findEmptyNonFFVCargoSeat); PREP(handleGetIn); PREP(handleGetOut); -PREP(handleKilled); PREP(handleOnUnconscious); PREP(handlePlayerChanged); PREP(handleRespawn); From 6588237e8cd43c1653383662b247773106d37360 Mon Sep 17 00:00:00 2001 From: gienkov Date: Sat, 12 Sep 2015 21:25:02 +0200 Subject: [PATCH 30/35] stringtable DAGR --- addons/dagr/CfgVehicles.hpp | 6 +++--- addons/dagr/CfgWeapons.hpp | 4 ++-- addons/dagr/stringtable.xml | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/addons/dagr/CfgVehicles.hpp b/addons/dagr/CfgVehicles.hpp index a9948ca8aa..7f0a7f6cff 100644 --- a/addons/dagr/CfgVehicles.hpp +++ b/addons/dagr/CfgVehicles.hpp @@ -4,7 +4,7 @@ class CfgVehicles { class ACE_SelfActions { class ACE_Equipment { class GVAR(menu) { - displayName = "Configure DAGR"; + displayName = CSTRING(ConfigureDAGR); condition = QUOTE([ARR_2(_player,'ACE_DAGR')] call EFUNC(common,hasItem)); statement = QUOTE(call FUNC(menuInit)); showDisabled = 0; @@ -12,7 +12,7 @@ class CfgVehicles { icon = QUOTE(PATHTOF(UI\DAGR_Icon.paa)); exceptions[] = {"isNotInside", "isNotSitting"}; class GVAR(toggle) { - displayName = "Toggle DAGR"; + displayName = CSTRING(ToggleDAGR); condition = QUOTE([ARR_2(_player,'ACE_DAGR')] call EFUNC(common,hasItem)); statement = QUOTE(call FUNC(toggleOverlay)); showDisabled = 0; @@ -30,7 +30,7 @@ class CfgVehicles { author[] = {"Rosuto", "Ruthberg"}; scope = 2; scopeCurator = 2; - displayName = "DAGR"; + displayName = CSTRING(Name); vehicleClass = "Items"; class TransportItems { MACRO_ADDITEM(ACE_DAGR,1); diff --git a/addons/dagr/CfgWeapons.hpp b/addons/dagr/CfgWeapons.hpp index 830e9cf115..9fcd903cdd 100644 --- a/addons/dagr/CfgWeapons.hpp +++ b/addons/dagr/CfgWeapons.hpp @@ -6,9 +6,9 @@ class CfgWeapons { class ACE_DAGR: ACE_ItemCore { author[] = {$STR_ACE_Common_ACETeam, "Ruthberg"}; scope = 2; - displayName = "DAGR"; + displayName = CSTRING(Name); model = QUOTE(PATHTOF(data\DAGR.p3d)); - descriptionShort = ""; + descriptionShort = CSTRING(Description); picture = PATHTOF(UI\DAGR_Icon.paa); icon = "iconObject_circle"; mapSize = 0.034; diff --git a/addons/dagr/stringtable.xml b/addons/dagr/stringtable.xml index 7da844d614..77502f271b 100644 --- a/addons/dagr/stringtable.xml +++ b/addons/dagr/stringtable.xml @@ -1,5 +1,21 @@  + + DAGR + DAGR + + + Configure DAGR + Konfiguruj DAGR + + + Toggle DAGR + Przełącz DAGR + + + Defense Advanced GPS Receiver + Defense Advanced GPS Receiver + \ No newline at end of file From 9cd470b8494f7985aefe4b95c096ae3e66142978 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 15 Sep 2015 09:54:55 -0500 Subject: [PATCH 31/35] Add Setting for toolkit requirement for wheel repair --- addons/repair/ACE_Repair.hpp | 3 ++- addons/repair/ACE_Settings.hpp | 9 +++++++++ addons/repair/CfgVehicles.hpp | 9 +++++++++ addons/repair/functions/fnc_canRepair.sqf | 16 ++++++++++++++-- .../functions/fnc_moduleRepairSettings.sqf | 2 ++ addons/repair/functions/fnc_repair.sqf | 15 +++++++++++++-- addons/repair/stringtable.xml | 6 ++++++ 7 files changed, 55 insertions(+), 5 deletions(-) diff --git a/addons/repair/ACE_Repair.hpp b/addons/repair/ACE_Repair.hpp index 219945003d..a8aac18690 100644 --- a/addons/repair/ACE_Repair.hpp +++ b/addons/repair/ACE_Repair.hpp @@ -8,7 +8,7 @@ class ACE_Repair { requiredEngineer = QGVAR(engineerSetting_Wheel); repairingTime = 10; repairingTimeSelfCoef = 1; - items[] = {"ToolKit"}; + items = QGVAR(wheelRepairRequiredItems); condition = QUOTE(call FUNC(canReplaceWheel)); itemConsumed = 0; @@ -35,6 +35,7 @@ class ACE_Repair { requiredEngineer = 0; repairingTime = 15; callbackSuccess = QUOTE(call FUNC(doRepair)); + items[] = {"ToolKit"}; }; class RepairTrack: MiscRepair { displayName = CSTRING(Repairing); diff --git a/addons/repair/ACE_Settings.hpp b/addons/repair/ACE_Settings.hpp index fc3f063fb1..22e68ce3e9 100644 --- a/addons/repair/ACE_Settings.hpp +++ b/addons/repair/ACE_Settings.hpp @@ -68,4 +68,13 @@ class ACE_Settings { value = 1; category = ECSTRING(OptionsMenu,CategoryLogistics); }; + class GVAR(wheelRepairRequiredItems) { + displayName = CSTRING(wheelRepairRequiredItems_name); + description = CSTRING(wheelRepairRequiredItems_description); + category = ECSTRING(OptionsMenu,CategoryLogistics); + typeName = "SCALAR"; + value = 0; + values[] = {"None", "ToolKit"}; + _values[] = {{}, {"ToolKit"}}; + }; }; diff --git a/addons/repair/CfgVehicles.hpp b/addons/repair/CfgVehicles.hpp index e9ca5258ba..83d44592ce 100644 --- a/addons/repair/CfgVehicles.hpp +++ b/addons/repair/CfgVehicles.hpp @@ -97,6 +97,15 @@ class CfgVehicles { typeName = "BOOL"; defaultValue = 1; }; + class wheelRepairRequiredItems { + displayName = CSTRING(wheelRepairRequiredItems_name); + description = CSTRING(wheelRepairRequiredItems_description); + typeName = "NUMBER"; + class values { + class None { name = "None"; value = 0; default = 1;}; + class ToolKit { name = "ToolKit"; value = 1; }; + }; + }; }; class ModuleDescription { description = CSTRING(moduleDescription); diff --git a/addons/repair/functions/fnc_canRepair.sqf b/addons/repair/functions/fnc_canRepair.sqf index bb44a3dcd4..d86b1b599b 100644 --- a/addons/repair/functions/fnc_canRepair.sqf +++ b/addons/repair/functions/fnc_canRepair.sqf @@ -21,7 +21,7 @@ params ["_caller", "_target", "_hitPoint", "_className"]; TRACE_4("params",_caller,_target,_hitPoint,_className); -private ["_config", "_engineerRequired", "_items", "_locations", "_return", "_condition", "_vehicleStateCondition"]; +private ["_config", "_engineerRequired", "_items", "_locations", "_return", "_condition", "_vehicleStateCondition", "_settingName", "_settingItemsArray"]; _config = (ConfigFile >> "ACE_Repair" >> "Actions" >> _className); if !(isClass _config) exitwith {false}; // or go for a default? @@ -38,7 +38,19 @@ _engineerRequired = if (isNumber (_config >> "requiredEngineer")) then { }; if !([_caller, _engineerRequired] call FUNC(isEngineer)) exitwith {false}; -_items = getArray (_config >> "items"); +//Items can be an array of required items or a string to a ACE_Setting array +_items = if (isArray (_config >> "items")) then { + getArray (_config >> "items"); +} else { + _settingName = getText (_config >> "items"); + _settingItemsArray = getArray (configFile >> "ACE_Settings" >> _settingName >> "_values"); + if ((isNil _settingName) || {(missionNamespace getVariable _settingName) >= (count _settingItemsArray)}) exitWith { + ERROR("bad setting"); ["BAD"] + }; + _settingItemsArray select (missionNamespace getVariable _settingName); +}; + +x3 = _items; if (count _items > 0 && {!([_caller, _items] call FUNC(hasItems))}) exitwith {false}; _return = true; diff --git a/addons/repair/functions/fnc_moduleRepairSettings.sqf b/addons/repair/functions/fnc_moduleRepairSettings.sqf index aad1e7a8d1..98ff354662 100644 --- a/addons/repair/functions/fnc_moduleRepairSettings.sqf +++ b/addons/repair/functions/fnc_moduleRepairSettings.sqf @@ -33,4 +33,6 @@ if (!isServer) exitWith {}; [_logic, QGVAR(addSpareParts), "addSpareParts"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(wheelRepairRequiredItems), "wheelRepairRequiredItems"] call EFUNC(common,readSettingFromModule); + ACE_LOGINFO("Repair Module Initialized."); diff --git a/addons/repair/functions/fnc_repair.sqf b/addons/repair/functions/fnc_repair.sqf index 4fa1c2d903..fd3b4f032b 100644 --- a/addons/repair/functions/fnc_repair.sqf +++ b/addons/repair/functions/fnc_repair.sqf @@ -21,7 +21,7 @@ params ["_caller", "_target", "_hitPoint", "_className"]; TRACE_4("params",_calller,_target,_hitPoint,_className); -private["_callbackProgress", "_callerAnim", "_calller", "_condition", "_config", "_consumeItems", "_displayText", "_engineerRequired", "_iconDisplayed", "_items", "_locations", "_repairTime", "_repairTimeConfig", "_return", "_usersOfItems", "_vehicleStateCondition", "_wpn"]; +private["_callbackProgress", "_callerAnim", "_calller", "_condition", "_config", "_consumeItems", "_displayText", "_engineerRequired", "_iconDisplayed", "_items", "_locations", "_repairTime", "_repairTimeConfig", "_return", "_usersOfItems", "_vehicleStateCondition", "_wpn", "_settingName", "_settingItemsArray"]; _config = (ConfigFile >> "ACE_Repair" >> "Actions" >> _className); if !(isClass _config) exitwith {false}; // or go for a default? @@ -37,7 +37,18 @@ _engineerRequired = if (isNumber (_config >> "requiredEngineer")) then { }; if !([_caller, _engineerRequired] call FUNC(isEngineer)) exitwith {false}; if (isEngineOn _target) exitwith {false}; -_items = getArray (_config >> "items"); + +//Items can be an array of required items or a string to a ACE_Setting array +_items = if (isArray (_config >> "items")) then { + getArray (_config >> "items"); +} else { + _settingName = getText (_config >> "items"); + _settingItemsArray = getArray (configFile >> "ACE_Settings" >> _settingName >> "_values"); + if ((isNil _settingName) || {(missionNamespace getVariable _settingName) >= (count _settingItemsArray)}) exitWith { + ERROR("bad setting"); ["BAD"] + }; + _settingItemsArray select (missionNamespace getVariable _settingName); +}; if (count _items > 0 && {!([_caller, _items] call FUNC(hasItems))}) exitwith {false}; _return = true; diff --git a/addons/repair/stringtable.xml b/addons/repair/stringtable.xml index 77687ae9cc..43c8a9a003 100644 --- a/addons/repair/stringtable.xml +++ b/addons/repair/stringtable.xml @@ -901,5 +901,11 @@ Ilość wybranych części zamiennych. Número de partes sobressalentes. + + Req Items for wheel repair + + + Items required to remove/replace wheels + From c50c53e5bbe5c36976b7fbb4cae1cf818eb36f23 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 15 Sep 2015 09:57:53 -0500 Subject: [PATCH 32/35] remove debug --- addons/repair/functions/fnc_canRepair.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/repair/functions/fnc_canRepair.sqf b/addons/repair/functions/fnc_canRepair.sqf index d86b1b599b..8fb2a4938e 100644 --- a/addons/repair/functions/fnc_canRepair.sqf +++ b/addons/repair/functions/fnc_canRepair.sqf @@ -49,8 +49,6 @@ _items = if (isArray (_config >> "items")) then { }; _settingItemsArray select (missionNamespace getVariable _settingName); }; - -x3 = _items; if (count _items > 0 && {!([_caller, _items] call FUNC(hasItems))}) exitwith {false}; _return = true; From db37fa0e043bb59dcf34c137117421d60ab75f1b Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 15 Sep 2015 11:45:02 -0500 Subject: [PATCH 33/35] Update stringtable.xml --- addons/repair/stringtable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/repair/stringtable.xml b/addons/repair/stringtable.xml index 43c8a9a003..8de9b07d90 100644 --- a/addons/repair/stringtable.xml +++ b/addons/repair/stringtable.xml @@ -902,7 +902,7 @@ Número de partes sobressalentes. - Req Items for wheel repair + Wheel repair requirements Items required to remove/replace wheels From c6c51af5484faf2167e597a8563e76b8bcbceb45 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Tue, 15 Sep 2015 21:13:36 +0200 Subject: [PATCH 34/35] Updated build version --- addons/main/script_mod.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp index 62e87431d5..c7e5d2c125 100644 --- a/addons/main/script_mod.hpp +++ b/addons/main/script_mod.hpp @@ -6,7 +6,7 @@ #define MAJOR 3 #define MINOR 3 #define PATCHLVL 0 -#define BUILD 1 +#define BUILD 2 #define VERSION MAJOR.MINOR.PATCHLVL.BUILD #define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD From a124b0567211264493ee4e7d65d9c825a71c45c4 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Tue, 15 Sep 2015 21:25:01 +0200 Subject: [PATCH 35/35] Revert "disable a10 tracers, commanche tracers only nvg" --- addons/aircraft/CfgAmmo.hpp | 2 +- addons/aircraft/CfgMagazines.hpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index 867b247a5a..8aa5d3173e 100644 --- a/addons/aircraft/CfgAmmo.hpp +++ b/addons/aircraft/CfgAmmo.hpp @@ -11,7 +11,7 @@ class CfgAmmo { explosive = 1.8; tracersEvery = 3; tracerEndTime = 3.5; - nvgOnly = 1; + CraterEffects = "ExploAmmoCrater"; explosionEffects = "ExploAmmoExplosion"; model = "\A3\Weapons_f\Data\bullettracer\tracer_red"; diff --git a/addons/aircraft/CfgMagazines.hpp b/addons/aircraft/CfgMagazines.hpp index 11704056d1..b09bac6943 100644 --- a/addons/aircraft/CfgMagazines.hpp +++ b/addons/aircraft/CfgMagazines.hpp @@ -5,7 +5,6 @@ class CfgMagazines { class 1000Rnd_Gatling_30mm_Plane_CAS_01_F: VehicleMagazine { ammo = "ACE_Gatling_30mm_HE_Plane_CAS_01_Deploy"; count = 1170; - tracersEvery = 0; }; // an extended magazine for the comanche