diff --git a/addons/accessory/fnc_switchAttachment.sqf b/addons/accessory/fnc_switchAttachment.sqf index 913652068..a4e8e11ca 100644 --- a/addons/accessory/fnc_switchAttachment.sqf +++ b/addons/accessory/fnc_switchAttachment.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_accessory_fnc_switchAttachment @@ -20,7 +21,6 @@ Examples: Author: Robalo, optimized by Anton ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params ["_itemType", "_switchTo"]; diff --git a/addons/ai/fnc_addWaypoint.sqf b/addons/ai/fnc_addWaypoint.sqf index 96467a0e9..dbf711e46 100644 --- a/addons/ai/fnc_addWaypoint.sqf +++ b/addons/ai/fnc_addWaypoint.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addWaypoint @@ -31,7 +32,6 @@ Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [ "_group", "_position", diff --git a/addons/ai/fnc_clearWaypoints.sqf b/addons/ai/fnc_clearWaypoints.sqf index bc9223e47..72bd57c34 100644 --- a/addons/ai/fnc_clearWaypoints.sqf +++ b/addons/ai/fnc_clearWaypoints.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_clearWaypoints @@ -19,7 +20,6 @@ Author: SilentSpike ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_group", grpNull, [grpNull, objNull]]]; _group = _group call CBA_fnc_getGroup; diff --git a/addons/ai/fnc_taskAttack.sqf b/addons/ai/fnc_taskAttack.sqf index 359986ccd..c966eba0d 100644 --- a/addons/ai/fnc_taskAttack.sqf +++ b/addons/ai/fnc_taskAttack.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_taskAttack @@ -25,8 +26,6 @@ Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - params ["_group", "_position", ["_radius", 0], ["_override", false]]; _group = _group call CBA_fnc_getGroup; diff --git a/addons/ai/fnc_taskPatrol.sqf b/addons/ai/fnc_taskPatrol.sqf index 66705d82a..2311f7b74 100644 --- a/addons/ai/fnc_taskPatrol.sqf +++ b/addons/ai/fnc_taskPatrol.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_taskPatrol @@ -33,8 +34,6 @@ Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - params [ ["_group", grpNull, [grpNull, objNull]], ["_position", [], [[], objNull, grpNull, locationNull], [2, 3]], diff --git a/addons/ai/fnc_taskSearchArea.sqf b/addons/ai/fnc_taskSearchArea.sqf index e990b64d5..a4f88a977 100644 --- a/addons/ai/fnc_taskSearchArea.sqf +++ b/addons/ai/fnc_taskSearchArea.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_taskSearchArea @@ -30,7 +31,6 @@ Examples: Author: SilentSpike 2015-08-17 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [ ["_group", objNull, [objNull,grpNull]], ["_area", "", ["",objNull, locationNull,[]], 5], diff --git a/addons/ai/fnc_waypointGarrison.sqf b/addons/ai/fnc_waypointGarrison.sqf index 6883421ff..57cfad45d 100644 --- a/addons/ai/fnc_waypointGarrison.sqf +++ b/addons/ai/fnc_waypointGarrison.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Script: fnc_waypointGarrison @@ -21,7 +22,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" #define POP_RAND(array) (array deleteAt floor random count array) diff --git a/addons/arrays/fnc_filter.sqf b/addons/arrays/fnc_filter.sqf index 37507b2ae..864669c41 100644 --- a/addons/arrays/fnc_filter.sqf +++ b/addons/arrays/fnc_filter.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_filter @@ -32,7 +33,6 @@ Examples: Author: Spooner, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(filter); params [["_array", [], [[]]], ["_filter", {_x}, [{}]], ["_inPlace", false, [false]]]; diff --git a/addons/arrays/fnc_findMax.sqf b/addons/arrays/fnc_findMax.sqf index 27c1e80a0..f8b1b9db7 100644 --- a/addons/arrays/fnc_findMax.sqf +++ b/addons/arrays/fnc_findMax.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_findMax @@ -21,7 +22,6 @@ Author: joko // Jonas, commy2, Dorbedo ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(findMax); [_this] params [["_array", [], [[]]]]; diff --git a/addons/arrays/fnc_findMin.sqf b/addons/arrays/fnc_findMin.sqf index 9ba8d474b..e5a4e7fb3 100644 --- a/addons/arrays/fnc_findMin.sqf +++ b/addons/arrays/fnc_findMin.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_findMin @@ -21,7 +22,6 @@ Author: joko // Jonas, commy2, Dorbedo ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(findMin); [_this] params [["_array", [], [[]]]]; diff --git a/addons/arrays/fnc_findNil.sqf b/addons/arrays/fnc_findNil.sqf index 3783f61d4..fd248b951 100644 --- a/addons/arrays/fnc_findNil.sqf +++ b/addons/arrays/fnc_findNil.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_findNil @@ -18,7 +19,6 @@ Returns: Author: joko // Jonas ---------------------------------------------------------------------------- */ -#include "script_component.hpp" [_this] params [["_array", [], [[]]]]; diff --git a/addons/arrays/fnc_findNull.sqf b/addons/arrays/fnc_findNull.sqf index 1f5a398fd..a05914870 100644 --- a/addons/arrays/fnc_findNull.sqf +++ b/addons/arrays/fnc_findNull.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_findNull @@ -18,7 +19,6 @@ Returns: Author: joko // Jonas ---------------------------------------------------------------------------- */ -#include "script_component.hpp" [_this] params [["_array", [], [[]]]]; diff --git a/addons/arrays/fnc_findTypeName.sqf b/addons/arrays/fnc_findTypeName.sqf index bc21c171d..f54206f82 100644 --- a/addons/arrays/fnc_findTypeName.sqf +++ b/addons/arrays/fnc_findTypeName.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_findTypeName @@ -19,7 +20,6 @@ Returns: Author: joko // Jonas ---------------------------------------------------------------------------- */ -#include "script_component.hpp" #define TYPENAMES ["ARRAY", "BOOL", "CODE", "CONFIG", "CONTROL", "DISPLAY", "GROUP", "LOCATION", "OBJECT", "SCALAR", "SCRIPT", "SIDE", "STRING", "TASK", "TEXT", "TEAM_MEMBER", "NAMESPACE"] diff --git a/addons/arrays/fnc_findTypeOf.sqf b/addons/arrays/fnc_findTypeOf.sqf index 91483f1fb..252c46d69 100644 --- a/addons/arrays/fnc_findTypeOf.sqf +++ b/addons/arrays/fnc_findTypeOf.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_findTypeOf @@ -21,7 +22,6 @@ Returns: Author: joko // Jonas ---------------------------------------------------------------------------- */ -#include "script_component.hpp" scopeName "main"; diff --git a/addons/arrays/fnc_getArrayDiff.sqf b/addons/arrays/fnc_getArrayDiff.sqf index 7ab18bebf..2a4bd8df4 100644 --- a/addons/arrays/fnc_getArrayDiff.sqf +++ b/addons/arrays/fnc_getArrayDiff.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getArrayDiff @@ -20,8 +21,6 @@ Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - #define NULL "$null$" params ["_arrayA", "_arrayB"]; diff --git a/addons/arrays/fnc_inject.sqf b/addons/arrays/fnc_inject.sqf index 00605bbfa..ce5a4d4fa 100644 --- a/addons/arrays/fnc_inject.sqf +++ b/addons/arrays/fnc_inject.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_inject @@ -33,8 +34,6 @@ Author: Spooner ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - SCRIPT(inject); // ----------------------------------------------------------------------------- diff --git a/addons/arrays/fnc_insert.sqf b/addons/arrays/fnc_insert.sqf index a6b8063ea..749b7b128 100644 --- a/addons/arrays/fnc_insert.sqf +++ b/addons/arrays/fnc_insert.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_insert @@ -24,7 +25,6 @@ Examples: Author: 654wak654 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" #define ARRAY_ELEMENT_LIMIT 1E7 SCRIPT(insert); diff --git a/addons/arrays/fnc_join.sqf b/addons/arrays/fnc_join.sqf index 67bceaf9e..f4b1776ff 100644 --- a/addons/arrays/fnc_join.sqf +++ b/addons/arrays/fnc_join.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_join @@ -29,8 +30,6 @@ Author: Spooner ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - SCRIPT(join); // ---------------------------------------------------------------------------- diff --git a/addons/arrays/fnc_reject.sqf b/addons/arrays/fnc_reject.sqf index c6d31ca23..22e201c53 100644 --- a/addons/arrays/fnc_reject.sqf +++ b/addons/arrays/fnc_reject.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_reject @@ -21,8 +22,6 @@ Author: MuzzleFlash ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - SCRIPT(reject); // ---------------------------------------------------------------------------- diff --git a/addons/arrays/fnc_select.sqf b/addons/arrays/fnc_select.sqf index 972e82e80..4e4efe0a0 100644 --- a/addons/arrays/fnc_select.sqf +++ b/addons/arrays/fnc_select.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_select @@ -21,8 +22,6 @@ Author: MuzzleFlash ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - SCRIPT(select); // ---------------------------------------------------------------------------- diff --git a/addons/arrays/fnc_shuffle.sqf b/addons/arrays/fnc_shuffle.sqf index dd1f3ea37..7b946cbe7 100644 --- a/addons/arrays/fnc_shuffle.sqf +++ b/addons/arrays/fnc_shuffle.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_shuffle @@ -24,7 +25,6 @@ Author: toadlife (version 1.01) http://toadlife.net rewritten by Spooner, Dorbedo ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(shuffle); params [["_array", [], [[]]], ["_inPlace", false, [false]]]; diff --git a/addons/arrays/fnc_sortNestedArray.sqf b/addons/arrays/fnc_sortNestedArray.sqf index c1e101dc7..b25504083 100644 --- a/addons/arrays/fnc_sortNestedArray.sqf +++ b/addons/arrays/fnc_sortNestedArray.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_sortNestedArray @@ -23,7 +24,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(sortNestedArray); params [["_array", [], [[]]], ["_index", 0, [0]], ["_order", true, [false]]]; diff --git a/addons/common/fnc_actionArgument.sqf b/addons/common/fnc_actionArgument.sqf index d9193455d..0bfb7ea8c 100644 --- a/addons/common/fnc_actionArgument.sqf +++ b/addons/common/fnc_actionArgument.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_actionArgument @@ -16,7 +17,6 @@ Examples: Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(actionArgument); params ["_target", "_caller", "_id", "_arguments"]; diff --git a/addons/common/fnc_addBackpackCargo.sqf b/addons/common/fnc_addBackpackCargo.sqf index 753c68535..60b8be793 100644 --- a/addons/common/fnc_addBackpackCargo.sqf +++ b/addons/common/fnc_addBackpackCargo.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addBackpackCargo @@ -28,7 +29,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addBackpackCargo); params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_verify", false, [false]]]; diff --git a/addons/common/fnc_addBinocularMagazine.sqf b/addons/common/fnc_addBinocularMagazine.sqf index 53a536a8b..902f58b20 100644 --- a/addons/common/fnc_addBinocularMagazine.sqf +++ b/addons/common/fnc_addBinocularMagazine.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addBinocularMagazine @@ -23,7 +24,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addBinocularMagazine); params [["_unit", objNull, [objNull]], ["_magazine", "", [""]], ["_ammo", nil, [0]]]; diff --git a/addons/common/fnc_addItem.sqf b/addons/common/fnc_addItem.sqf index e01c38f25..2b2abf75d 100644 --- a/addons/common/fnc_addItem.sqf +++ b/addons/common/fnc_addItem.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addItem @@ -23,7 +24,6 @@ Examples: Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addItem); params [["_unit", objNull, [objNull]], ["_item", "", [""]], ["_verify", false, [false]]]; diff --git a/addons/common/fnc_addItemCargo.sqf b/addons/common/fnc_addItemCargo.sqf index 0bbefdb7e..4991ea4d8 100644 --- a/addons/common/fnc_addItemCargo.sqf +++ b/addons/common/fnc_addItemCargo.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addItemCargo @@ -28,7 +29,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addItemCargo); params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_verify", false, [false]]]; diff --git a/addons/common/fnc_addMagazine.sqf b/addons/common/fnc_addMagazine.sqf index d9515ca01..e1ab8e1fc 100644 --- a/addons/common/fnc_addMagazine.sqf +++ b/addons/common/fnc_addMagazine.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addMagazine @@ -24,7 +25,6 @@ Examples: Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addMagazine); params [["_unit", objNull, [objNull]], ["_item", "", [""]], ["_ammo", -1, [0]], ["_verify", false, [false]]]; diff --git a/addons/common/fnc_addMagazineCargo.sqf b/addons/common/fnc_addMagazineCargo.sqf index 42bf4b4ba..f57fab7b4 100644 --- a/addons/common/fnc_addMagazineCargo.sqf +++ b/addons/common/fnc_addMagazineCargo.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addMagazineCargo @@ -28,7 +29,6 @@ Examples: Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addMagazineCargo); params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_verify", false, [false]]]; diff --git a/addons/common/fnc_addPerFrameHandler.sqf b/addons/common/fnc_addPerFrameHandler.sqf index 6948c6af6..4ab364026 100644 --- a/addons/common/fnc_addPerFrameHandler.sqf +++ b/addons/common/fnc_addPerFrameHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addPerFrameHandler @@ -25,7 +26,6 @@ Examples: Author: Nou & Jaynus, donated from ACRE project code for use by the community; commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_function", {}, [{}]], ["_delay", 0, [0]], ["_args", []]]; diff --git a/addons/common/fnc_addPlayerAction.sqf b/addons/common/fnc_addPlayerAction.sqf index a514c3148..5d37e13fc 100644 --- a/addons/common/fnc_addPlayerAction.sqf +++ b/addons/common/fnc_addPlayerAction.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* Function: CBA_fnc_addPlayerAction @@ -24,8 +25,6 @@ Author: Sickboy */ -//#define DEBUG_MODE_FULL -#include "script_component.hpp" params ["_actionArray"]; TRACE_1(_this); diff --git a/addons/common/fnc_addWeapon.sqf b/addons/common/fnc_addWeapon.sqf index 874419de0..c17945fe3 100644 --- a/addons/common/fnc_addWeapon.sqf +++ b/addons/common/fnc_addWeapon.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addWeapon @@ -23,7 +24,6 @@ Examples: Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addWeapon); #define TYPE_RIFLE 1 diff --git a/addons/common/fnc_addWeaponCargo.sqf b/addons/common/fnc_addWeaponCargo.sqf index 4b2a3f6fa..4968764d6 100644 --- a/addons/common/fnc_addWeaponCargo.sqf +++ b/addons/common/fnc_addWeaponCargo.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addWeaponCargo @@ -28,7 +29,6 @@ Examples: Author: Sickboy ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addWeaponCargo); params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_verify", false, [false]]]; diff --git a/addons/common/fnc_allNamespaces.sqf b/addons/common/fnc_allNamespaces.sqf index 4ad121ed2..2ac4e9ffd 100644 --- a/addons/common/fnc_allNamespaces.sqf +++ b/addons/common/fnc_allNamespaces.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_allNamespaces @@ -18,7 +19,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(allNamespaces); nearestLocations [DUMMY_POSITION, ["CBA_NamespaceDummy"], 1] + (nearestObjects [ASLToAGL DUMMY_POSITION, [], 1] select {typeOf _x isEqualTo "CBA_NamespaceDummy"}) diff --git a/addons/common/fnc_binocularMagazine.sqf b/addons/common/fnc_binocularMagazine.sqf index 2ce6d9dd2..deb3e3581 100644 --- a/addons/common/fnc_binocularMagazine.sqf +++ b/addons/common/fnc_binocularMagazine.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_binocularMagazine @@ -18,7 +19,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(binocularMagazine); params [["_unit", objNull, [objNull]]]; diff --git a/addons/common/fnc_canUseWeapon.sqf b/addons/common/fnc_canUseWeapon.sqf index 0328cc90e..49653b41e 100644 --- a/addons/common/fnc_canUseWeapon.sqf +++ b/addons/common/fnc_canUseWeapon.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_canUseWeapon @@ -18,7 +19,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(canUseWeapon); params [["_unit", objNull, [objNull]]]; diff --git a/addons/common/fnc_compileFinal.sqf b/addons/common/fnc_compileFinal.sqf index 0156c3d01..3c5cf0cb5 100644 --- a/addons/common/fnc_compileFinal.sqf +++ b/addons/common/fnc_compileFinal.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_compileFinal @@ -19,7 +20,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(compileFinal); params [["_name", "", [""]], ["_function", {}, [{}]]]; diff --git a/addons/common/fnc_createMarker.sqf b/addons/common/fnc_createMarker.sqf index fd3e624b6..7e4b709ee 100644 --- a/addons/common/fnc_createMarker.sqf +++ b/addons/common/fnc_createMarker.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_createMarker @@ -36,8 +37,6 @@ Examples: Author: Sickboy (sb_at_dev-heaven.net) 6thSense.eu Mod ---------------------------------------------------------------------------- */ -// #define DEBUG_MODE_FULL -#include "script_component.hpp" SCRIPT(createMarker); private _m = ""; diff --git a/addons/common/fnc_createNamespace.sqf b/addons/common/fnc_createNamespace.sqf index 4a51588e5..991ce6645 100644 --- a/addons/common/fnc_createNamespace.sqf +++ b/addons/common/fnc_createNamespace.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_createNamespace @@ -23,7 +24,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(createNamespace); params [["_isGlobal", false]]; diff --git a/addons/common/fnc_createPerFrameHandlerObject.sqf b/addons/common/fnc_createPerFrameHandlerObject.sqf index 272112717..d0bafd09d 100644 --- a/addons/common/fnc_createPerFrameHandlerObject.sqf +++ b/addons/common/fnc_createPerFrameHandlerObject.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_createPerFrameHandlerObject @@ -53,7 +54,6 @@ Examples: Author: Nou & Jaynus, donated from ACRE project code for use by the community; commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [ ["_function", {}, [{}]], diff --git a/addons/common/fnc_createTrigger.sqf b/addons/common/fnc_createTrigger.sqf index 79eec2346..9669101d8 100644 --- a/addons/common/fnc_createTrigger.sqf +++ b/addons/common/fnc_createTrigger.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_createTrigger @@ -26,8 +27,6 @@ Examples: Author: Sickboy (sb_at_dev-heaven.net) ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" SCRIPT(createTrigger); /* diff --git a/addons/common/fnc_currentMagazineIndex.sqf b/addons/common/fnc_currentMagazineIndex.sqf index bd38ccb4e..d9fff0094 100644 --- a/addons/common/fnc_currentMagazineIndex.sqf +++ b/addons/common/fnc_currentMagazineIndex.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_currentMagazineIndex @@ -14,7 +15,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(currentMagazineIndex); params [["_unit", objNull, [objNull]], ["_turret", nil, [[]]]]; diff --git a/addons/common/fnc_currentUnit.sqf b/addons/common/fnc_currentUnit.sqf index 61834a80a..713514337 100644 --- a/addons/common/fnc_currentUnit.sqf +++ b/addons/common/fnc_currentUnit.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_currentUnit @@ -13,7 +14,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(currentUnit); missionNamespace getVariable ["bis_fnc_moduleRemoteControl_unit", player] diff --git a/addons/common/fnc_deleteEntity.sqf b/addons/common/fnc_deleteEntity.sqf index 97dc53bb3..d1cf6ed85 100644 --- a/addons/common/fnc_deleteEntity.sqf +++ b/addons/common/fnc_deleteEntity.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_deleteEntity @@ -18,7 +19,6 @@ Returns: Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(deleteEntity); [_this] params [["_entity", objNull, [objNull, grpNull, locationNull, "", []]]]; diff --git a/addons/common/fnc_deleteNamespace.sqf b/addons/common/fnc_deleteNamespace.sqf index 6308f8e25..02657cb20 100644 --- a/addons/common/fnc_deleteNamespace.sqf +++ b/addons/common/fnc_deleteNamespace.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_deleteNamespace @@ -18,7 +19,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(deleteNamespace); params [["_namespace", locationNull, [locationNull, objNull]]]; diff --git a/addons/common/fnc_deletePerFrameHandlerObject.sqf b/addons/common/fnc_deletePerFrameHandlerObject.sqf index 1e0a7b679..0d0af486c 100644 --- a/addons/common/fnc_deletePerFrameHandlerObject.sqf +++ b/addons/common/fnc_deletePerFrameHandlerObject.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_deletePerFrameHandlerObject @@ -18,7 +19,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_logic", locationNull, [locationNull]]]; diff --git a/addons/common/fnc_directCall.sqf b/addons/common/fnc_directCall.sqf index cd0cccfd4..bc03701b9 100644 --- a/addons/common/fnc_directCall.sqf +++ b/addons/common/fnc_directCall.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_directCall @@ -20,7 +21,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_CBA_code", {}, [{}]], ["_this", []]]; diff --git a/addons/common/fnc_dropItem.sqf b/addons/common/fnc_dropItem.sqf index 237ee20ba..7c8791645 100644 --- a/addons/common/fnc_dropItem.sqf +++ b/addons/common/fnc_dropItem.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_dropItem @@ -22,7 +23,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(dropItem); params [["_unit", objNull, [objNull]], ["_item", "", [""]]]; diff --git a/addons/common/fnc_dropMagazine.sqf b/addons/common/fnc_dropMagazine.sqf index 4a714865b..e6eaba6c5 100644 --- a/addons/common/fnc_dropMagazine.sqf +++ b/addons/common/fnc_dropMagazine.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_dropMagazine @@ -23,7 +24,6 @@ Examples: Author: ?, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(dropMagazine); params [["_unit", objNull, [objNull]], ["_item", "", [""]], ["_ammo", -1, [0]]]; diff --git a/addons/common/fnc_dropWeapon.sqf b/addons/common/fnc_dropWeapon.sqf index 219f476de..3c3abff73 100644 --- a/addons/common/fnc_dropWeapon.sqf +++ b/addons/common/fnc_dropWeapon.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_dropWeapon @@ -22,7 +23,6 @@ Examples: Author: ?, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(dropWeapon); params [["_unit", objNull, [objNull]], ["_item", "", [""]]]; diff --git a/addons/common/fnc_execNextFrame.sqf b/addons/common/fnc_execNextFrame.sqf index 7ff302436..c81cc92b9 100644 --- a/addons/common/fnc_execNextFrame.sqf +++ b/addons/common/fnc_execNextFrame.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_execNextFrame @@ -19,7 +20,6 @@ Examples: Author: esteldunedain and PabstMirror, donated from ACE3 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_function", {}, [{}]], ["_args", []]]; diff --git a/addons/common/fnc_findEntity.sqf b/addons/common/fnc_findEntity.sqf index 27ee43017..42d697cdb 100644 --- a/addons/common/fnc_findEntity.sqf +++ b/addons/common/fnc_findEntity.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_findEntity @@ -22,7 +23,6 @@ Returns: Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(findEntity); params [["_type", "", [objNull, ""]], ["_position", objNull], ["_radius", 50, [0]]]; diff --git a/addons/common/fnc_getAlive.sqf b/addons/common/fnc_getAlive.sqf index 4665e750b..5e6e43fe0 100644 --- a/addons/common/fnc_getAlive.sqf +++ b/addons/common/fnc_getAlive.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getAlive @@ -18,7 +19,6 @@ Returns: Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getAlive); [_this] params [["_entities", [], [objNull, grpNull, []]]]; diff --git a/addons/common/fnc_getAnimType.sqf b/addons/common/fnc_getAnimType.sqf index 84c685924..b78efe860 100644 --- a/addons/common/fnc_getAnimType.sqf +++ b/addons/common/fnc_getAnimType.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getAnimType @@ -19,8 +20,6 @@ Examples: Author: ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" SCRIPT(getAnimType); params ["_man","_array"]; diff --git a/addons/common/fnc_getArg.sqf b/addons/common/fnc_getArg.sqf index ed2f4d018..6db7206ef 100644 --- a/addons/common/fnc_getArg.sqf +++ b/addons/common/fnc_getArg.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getArg @@ -16,8 +17,6 @@ Examples: Author: Kronzky (www.kronzky.info) ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" SCRIPT(getArg); params ["_cLC", "_cUC", "_arg", "_list"] diff --git a/addons/common/fnc_getAspectRatio.sqf b/addons/common/fnc_getAspectRatio.sqf index 88848fd24..05cda5740 100644 --- a/addons/common/fnc_getAspectRatio.sqf +++ b/addons/common/fnc_getAspectRatio.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getAspectRatio @@ -20,8 +21,6 @@ Examples: Author: Deadfast @ Skypechat 090909, inspired and made CBA compliant by Vigilante ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" SCRIPT(getAspectRatio); private _output = toUpper _this; diff --git a/addons/common/fnc_getConfigEntry.sqf b/addons/common/fnc_getConfigEntry.sqf index 8d8b6c1e7..88188ea97 100644 --- a/addons/common/fnc_getConfigEntry.sqf +++ b/addons/common/fnc_getConfigEntry.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getConfigEntry @@ -23,8 +24,6 @@ Examples: Author: Sickboy (sb_at_dev-heaven.net) ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" SCRIPT(getConfigEntry); params ["_configEntry", "_entryType", "_defaultValue"]; diff --git a/addons/common/fnc_getDistance.sqf b/addons/common/fnc_getDistance.sqf index e634c1701..e1165ff26 100644 --- a/addons/common/fnc_getDistance.sqf +++ b/addons/common/fnc_getDistance.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getDistance @@ -18,7 +19,6 @@ Returns: Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getDistance); params [ diff --git a/addons/common/fnc_getFirer.sqf b/addons/common/fnc_getFirer.sqf index 227c0cc6e..d815c76aa 100644 --- a/addons/common/fnc_getFirer.sqf +++ b/addons/common/fnc_getFirer.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getFirer @@ -23,7 +24,6 @@ Returns: Author: Rocko, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getFirer); params [["_vehicle", objNull, [objNull]], ["_weapon", "", [""]]]; diff --git a/addons/common/fnc_getFov.sqf b/addons/common/fnc_getFov.sqf index 80d3403cc..e9502770e 100644 --- a/addons/common/fnc_getFov.sqf +++ b/addons/common/fnc_getFov.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getFov @@ -25,7 +26,6 @@ Authors: ---------------------------------------------------------------------------- */ -#include #define __dist 10000 #define __xOff 5000 diff --git a/addons/common/fnc_getGroup.sqf b/addons/common/fnc_getGroup.sqf index a20c1bcac..c015e139a 100644 --- a/addons/common/fnc_getGroup.sqf +++ b/addons/common/fnc_getGroup.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getGroup @@ -18,7 +19,6 @@ Returns: Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getGroup); params [["_entity", grpNull, [grpNull, objNull]]]; diff --git a/addons/common/fnc_getGroupIndex.sqf b/addons/common/fnc_getGroupIndex.sqf index e860a12e8..124f356dd 100644 --- a/addons/common/fnc_getGroupIndex.sqf +++ b/addons/common/fnc_getGroupIndex.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getGroupIndex @@ -20,7 +21,6 @@ Returns: Author: ?, A3: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getGroupIndex); params [["_unit", objNull, [objNull]]]; diff --git a/addons/common/fnc_getItemConfig.sqf b/addons/common/fnc_getItemConfig.sqf index 582835035..c7a7c72e9 100644 --- a/addons/common/fnc_getItemConfig.sqf +++ b/addons/common/fnc_getItemConfig.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getItemConfig @@ -20,7 +21,6 @@ Example: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getItemConfig); params [["_weapon", "", [""]]]; diff --git a/addons/common/fnc_getMagazineIndex.sqf b/addons/common/fnc_getMagazineIndex.sqf index 3d7341741..586dcab9f 100644 --- a/addons/common/fnc_getMagazineIndex.sqf +++ b/addons/common/fnc_getMagazineIndex.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getMagazineIndex @@ -14,7 +15,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getMagazineIndex); params [["_unit", objNull, [objNull]], ["_magazine", "", [""]]]; diff --git a/addons/common/fnc_getMuzzles.sqf b/addons/common/fnc_getMuzzles.sqf index 3490e3328..64441fc4d 100644 --- a/addons/common/fnc_getMuzzles.sqf +++ b/addons/common/fnc_getMuzzles.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getMuzzles @@ -19,7 +20,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getMuzzles); params [["_weapon", "", [""]]]; diff --git a/addons/common/fnc_getNearest.sqf b/addons/common/fnc_getNearest.sqf index c34de9194..bedd59984 100644 --- a/addons/common/fnc_getNearest.sqf +++ b/addons/common/fnc_getNearest.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getNearest @@ -24,7 +25,6 @@ Returns: Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getNearest); params [ diff --git a/addons/common/fnc_getNearestBuilding.sqf b/addons/common/fnc_getNearestBuilding.sqf index 696cca189..5f77c5e4a 100644 --- a/addons/common/fnc_getNearestBuilding.sqf +++ b/addons/common/fnc_getNearestBuilding.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getNearestBuilding @@ -18,7 +19,6 @@ Returns: Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getNearestBuilding); [_this] params [["_position", objNull, [objNull, []]]]; diff --git a/addons/common/fnc_getNonPresetClass.sqf b/addons/common/fnc_getNonPresetClass.sqf index b7687f4a6..249633cd0 100644 --- a/addons/common/fnc_getNonPresetClass.sqf +++ b/addons/common/fnc_getNonPresetClass.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getNonPresetClass @@ -20,7 +21,6 @@ Examples: Author: Jonpas ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getNonPresetClass); params [["_class", "", [""]], ["_rootConfig", "CfgWeapons", [""]]]; diff --git a/addons/common/fnc_getObjectConfig.sqf b/addons/common/fnc_getObjectConfig.sqf index d4bb07b47..7bdf067e7 100644 --- a/addons/common/fnc_getObjectConfig.sqf +++ b/addons/common/fnc_getObjectConfig.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getObjectConfig @@ -20,7 +21,6 @@ Example: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getObjectConfig); params [["_object", "", ["", objNull]]]; diff --git a/addons/common/fnc_getPos.sqf b/addons/common/fnc_getPos.sqf index 0f2bf4cda..918c2f16f 100644 --- a/addons/common/fnc_getPos.sqf +++ b/addons/common/fnc_getPos.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getPos @@ -24,7 +25,6 @@ Returns: Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getPos); params [ diff --git a/addons/common/fnc_getSharedGroup.sqf b/addons/common/fnc_getSharedGroup.sqf index 742b1695e..af969c6e7 100644 --- a/addons/common/fnc_getSharedGroup.sqf +++ b/addons/common/fnc_getSharedGroup.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getSharedGroup @@ -18,7 +19,6 @@ Examples: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getSharedGroup); #define SIDES [east, west, resistance, civilian, sideLogic] diff --git a/addons/common/fnc_getTerrainProfile.sqf b/addons/common/fnc_getTerrainProfile.sqf index a7badb6ae..3e39b72f6 100644 --- a/addons/common/fnc_getTerrainProfile.sqf +++ b/addons/common/fnc_getTerrainProfile.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getTerrainProfile @@ -20,7 +21,6 @@ Author: Rommel && Noubernou ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params ["_posA","_posB"]; _posA = _posA call CBA_fnc_getPos; diff --git a/addons/common/fnc_getTurret.sqf b/addons/common/fnc_getTurret.sqf index 964bc5bc1..246af2ac6 100644 --- a/addons/common/fnc_getTurret.sqf +++ b/addons/common/fnc_getTurret.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getTurret @@ -19,7 +20,6 @@ Returns: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getTurret); params [["_config", "", ["", objNull, configNull]], ["_turretPath", [], [[]]]]; diff --git a/addons/common/fnc_getUISize.sqf b/addons/common/fnc_getUISize.sqf index bb56a9fc0..6f192dc04 100644 --- a/addons/common/fnc_getUISize.sqf +++ b/addons/common/fnc_getUISize.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getUISize @@ -24,8 +25,6 @@ Examples: Author: Written by Deadfast and made CBA compliant by Vigilante ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" SCRIPT(getUISize); #define C_4to3 [1.818, 1.429, 1.176, 1] diff --git a/addons/common/fnc_getUnitAnim.sqf b/addons/common/fnc_getUnitAnim.sqf index 83c92fbeb..d8ee8ee07 100644 --- a/addons/common/fnc_getUnitAnim.sqf +++ b/addons/common/fnc_getUnitAnim.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getUnitAnim @@ -24,8 +25,6 @@ Examples: Author: ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" SCRIPT(getUnitAnim); private _unit = _this; diff --git a/addons/common/fnc_getUnitDeathAnim.sqf b/addons/common/fnc_getUnitDeathAnim.sqf index 9292902dd..a66438848 100644 --- a/addons/common/fnc_getUnitDeathAnim.sqf +++ b/addons/common/fnc_getUnitDeathAnim.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getUnitDeathAnim @@ -18,8 +19,6 @@ Examples: Author: ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" SCRIPT(getUnitDeathAnim); params ["_unit"]; diff --git a/addons/common/fnc_getVolume.sqf b/addons/common/fnc_getVolume.sqf index c376ad89b..495a4245a 100644 --- a/addons/common/fnc_getVolume.sqf +++ b/addons/common/fnc_getVolume.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getVolume @@ -18,7 +19,6 @@ Examples: Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getVolume); params [["_object", objNull, [objNull]]]; diff --git a/addons/common/fnc_getWeaponModes.sqf b/addons/common/fnc_getWeaponModes.sqf index 965583651..1817b9785 100644 --- a/addons/common/fnc_getWeaponModes.sqf +++ b/addons/common/fnc_getWeaponModes.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getWeaponModes @@ -20,7 +21,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getWeaponModes); params [["_weapon", "", [""]], ["_includeHidden", false, [false]]]; diff --git a/addons/common/fnc_headDir.sqf b/addons/common/fnc_headDir.sqf index 292646505..c640313c1 100644 --- a/addons/common/fnc_headDir.sqf +++ b/addons/common/fnc_headDir.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_headDir @@ -50,8 +51,6 @@ ImplementationNote: Author: rocko ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" SCRIPT(headDir); params [ diff --git a/addons/common/fnc_inheritsFrom.sqf b/addons/common/fnc_inheritsFrom.sqf index 6e6294f58..7da9d44b6 100644 --- a/addons/common/fnc_inheritsFrom.sqf +++ b/addons/common/fnc_inheritsFrom.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_inheritsFrom @@ -25,7 +26,6 @@ Examples: Author: Sickboy ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(inheritsFrom); params [["_config", configNull, [configNull]], ["_baseConfig", configNull, [configNull]]]; diff --git a/addons/common/fnc_isAlive.sqf b/addons/common/fnc_isAlive.sqf index 7b930e33e..a0092ef2c 100644 --- a/addons/common/fnc_isAlive.sqf +++ b/addons/common/fnc_isAlive.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_isAlive @@ -18,7 +19,6 @@ Returns: Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(isAlive); [_this] params [["_entity", objNull, [objNull, grpNull, []]]]; diff --git a/addons/common/fnc_isPerson.sqf b/addons/common/fnc_isPerson.sqf index 67a3a0b07..55a3ab5c8 100644 --- a/addons/common/fnc_isPerson.sqf +++ b/addons/common/fnc_isPerson.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_isPerson @@ -28,7 +29,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(isPerson); params [["_unit", "", [objNull, ""]]]; diff --git a/addons/common/fnc_isTerrainObject.sqf b/addons/common/fnc_isTerrainObject.sqf index 60b8680a1..688af9345 100644 --- a/addons/common/fnc_isTerrainObject.sqf +++ b/addons/common/fnc_isTerrainObject.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_isTerrainObject @@ -18,7 +19,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(isTerrainObject); params [["_object", objNull, [objNull]]]; diff --git a/addons/common/fnc_isTurnedOut.sqf b/addons/common/fnc_isTurnedOut.sqf index 8ef060027..736a3147b 100644 --- a/addons/common/fnc_isTurnedOut.sqf +++ b/addons/common/fnc_isTurnedOut.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_isTurnedOut @@ -27,8 +28,6 @@ Examples: Author: Nou, courtesy of ACRE project. ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" SCRIPT(isTurnedOut); params ["_unit"]; diff --git a/addons/common/fnc_isUnitGetOutAnim.sqf b/addons/common/fnc_isUnitGetOutAnim.sqf index 82eba4e7a..50525126e 100644 --- a/addons/common/fnc_isUnitGetOutAnim.sqf +++ b/addons/common/fnc_isUnitGetOutAnim.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_isUnitGetOutAnim @@ -23,7 +24,6 @@ Examples: Author: (c) Denisko-Redisko ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(isUnitGetOutAnim); params ["_unit"]; diff --git a/addons/common/fnc_mapDirTo.sqf b/addons/common/fnc_mapDirTo.sqf index d4cc950d6..34987353b 100644 --- a/addons/common/fnc_mapDirTo.sqf +++ b/addons/common/fnc_mapDirTo.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_mapDirTo @@ -29,7 +30,6 @@ Examples: Author: Nou (with credit to Headspace for the real math :p) ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(mapDirTo); diff --git a/addons/common/fnc_mapGridToPos.sqf b/addons/common/fnc_mapGridToPos.sqf index ad0358094..f064d0d52 100644 --- a/addons/common/fnc_mapGridToPos.sqf +++ b/addons/common/fnc_mapGridToPos.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_mapGridToPos @@ -25,7 +26,6 @@ Examples: Author: Nou ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(mapGridToPos); diff --git a/addons/common/fnc_mapRelPos.sqf b/addons/common/fnc_mapRelPos.sqf index a442e2dee..b4f1b3f10 100644 --- a/addons/common/fnc_mapRelPos.sqf +++ b/addons/common/fnc_mapRelPos.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_mapRelPos @@ -25,7 +26,6 @@ Examples: Author: Nou (with credit to Headspace, Rommel & Meat187 for the real math :p) ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(mapRelPos); diff --git a/addons/common/fnc_modelHeadDir.sqf b/addons/common/fnc_modelHeadDir.sqf index 90942e8a3..a6e8f1d8e 100644 --- a/addons/common/fnc_modelHeadDir.sqf +++ b/addons/common/fnc_modelHeadDir.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_modelHeadDir @@ -39,8 +40,6 @@ ImplementationNote: Author: Nou ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" SCRIPT(modelHeadDir); params ["_unit"]; diff --git a/addons/common/fnc_nearPlayer.sqf b/addons/common/fnc_nearPlayer.sqf index 9572d62bb..c48c5fe74 100644 --- a/addons/common/fnc_nearPlayer.sqf +++ b/addons/common/fnc_nearPlayer.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_nearPlayer @@ -19,7 +20,6 @@ Examples: Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(nearPlayer); params [["_entity", objNull], ["_distance", 0, [0]]]; diff --git a/addons/common/fnc_northingReversed.sqf b/addons/common/fnc_northingReversed.sqf index fd6842aae..c0a6356b2 100644 --- a/addons/common/fnc_northingReversed.sqf +++ b/addons/common/fnc_northingReversed.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_northingReversed @@ -19,7 +20,6 @@ Author: Nou ---------------------------------------------------------------------------- */ -#include "script_component.hpp" private _reversed = false; if (isNil QGVAR(mapReversed)) then { diff --git a/addons/common/fnc_objectRandom.sqf b/addons/common/fnc_objectRandom.sqf index 156e2a002..eb3d20b42 100644 --- a/addons/common/fnc_objectRandom.sqf +++ b/addons/common/fnc_objectRandom.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_objectRandom @@ -18,7 +19,6 @@ Examples: Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(objectRandom); params ["_o"]; diff --git a/addons/common/fnc_players.sqf b/addons/common/fnc_players.sqf index ee7e0cbf1..1633b1a17 100644 --- a/addons/common/fnc_players.sqf +++ b/addons/common/fnc_players.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_players @@ -20,7 +21,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(players); (allUnits + allDeadMen) select {isPlayer _x && {!(_x isKindOf "HeadlessClient_F")}} diff --git a/addons/common/fnc_randPos.sqf b/addons/common/fnc_randPos.sqf index d0e9cd7be..81597e07e 100644 --- a/addons/common/fnc_randPos.sqf +++ b/addons/common/fnc_randPos.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_randPos @@ -21,7 +22,6 @@ Returns: Author: Rommel, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(randPos); params [ diff --git a/addons/common/fnc_randPosArea.sqf b/addons/common/fnc_randPosArea.sqf index a9aa9d306..7b5e1c045 100644 --- a/addons/common/fnc_randPosArea.sqf +++ b/addons/common/fnc_randPosArea.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_randPosArea @@ -27,7 +28,6 @@ Examples: Author: SilentSpike 2015-07-06 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(randPosArea); params [ diff --git a/addons/common/fnc_realHeight.sqf b/addons/common/fnc_realHeight.sqf index 019ae37d9..7ee7f40de 100644 --- a/addons/common/fnc_realHeight.sqf +++ b/addons/common/fnc_realHeight.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_realHeight @@ -18,7 +19,6 @@ Examples: Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(realHeight); params [["_object", objNull, [objNull]]]; diff --git a/addons/common/fnc_removeBackpackCargo.sqf b/addons/common/fnc_removeBackpackCargo.sqf index e0b8eb3fb..e06aa6d7e 100644 --- a/addons/common/fnc_removeBackpackCargo.sqf +++ b/addons/common/fnc_removeBackpackCargo.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeBackpackCargo @@ -31,7 +32,6 @@ Examples: Author: Jonpas ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(removeBackpackCargo); params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_keepContents", false, [true]]]; diff --git a/addons/common/fnc_removeBinocularMagazine.sqf b/addons/common/fnc_removeBinocularMagazine.sqf index c1d39c6ff..c2077c784 100644 --- a/addons/common/fnc_removeBinocularMagazine.sqf +++ b/addons/common/fnc_removeBinocularMagazine.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeBinocularMagazine @@ -18,7 +19,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(removeBinocularMagazine); params [["_unit", objNull, [objNull]]]; diff --git a/addons/common/fnc_removeItem.sqf b/addons/common/fnc_removeItem.sqf index 20b6b249e..9057f7cfe 100644 --- a/addons/common/fnc_removeItem.sqf +++ b/addons/common/fnc_removeItem.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeItem @@ -22,7 +23,6 @@ Examples: Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(removeItem); params [["_unit", objNull, [objNull]], ["_item", "", [""]]]; diff --git a/addons/common/fnc_removeItemCargo.sqf b/addons/common/fnc_removeItemCargo.sqf index 7650572d2..87a1b9a84 100644 --- a/addons/common/fnc_removeItemCargo.sqf +++ b/addons/common/fnc_removeItemCargo.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeItemCargo @@ -31,7 +32,6 @@ Examples: Author: Jonpas ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(removeItemCargo); params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_keepContents", false, [true]]]; diff --git a/addons/common/fnc_removeMagazine.sqf b/addons/common/fnc_removeMagazine.sqf index 59c7e6868..854456761 100644 --- a/addons/common/fnc_removeMagazine.sqf +++ b/addons/common/fnc_removeMagazine.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeMagazine @@ -23,7 +24,6 @@ Examples: Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(removeMagazine); params [["_unit", objNull, [objNull]], ["_item", "", [""]], ["_ammo", -1, [0]]]; diff --git a/addons/common/fnc_removeMagazineCargo.sqf b/addons/common/fnc_removeMagazineCargo.sqf index 4a199a5ff..5b101d133 100644 --- a/addons/common/fnc_removeMagazineCargo.sqf +++ b/addons/common/fnc_removeMagazineCargo.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeMagazineCargo @@ -28,7 +29,6 @@ Examples: Author: silencer.helling3r 2012-12-22, Jonpas ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(removeMagazineCargo); params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_ammo", -1, [0]]]; diff --git a/addons/common/fnc_removePerFrameHandler.sqf b/addons/common/fnc_removePerFrameHandler.sqf index a8d4c8c6c..93846b162 100644 --- a/addons/common/fnc_removePerFrameHandler.sqf +++ b/addons/common/fnc_removePerFrameHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removePerFrameHandler @@ -20,7 +21,6 @@ Examples: Author: Nou & Jaynus, donated from ACRE project code for use by the community; commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_handle", -1, [0]]]; diff --git a/addons/common/fnc_removePlayerAction.sqf b/addons/common/fnc_removePlayerAction.sqf index 6a67b8f09..6aa9aad00 100644 --- a/addons/common/fnc_removePlayerAction.sqf +++ b/addons/common/fnc_removePlayerAction.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* Function: CBA_fnc_removePlayerAction @@ -24,8 +25,6 @@ Author: Sickboy */ -//#define DEBUG_MODE_FULL -#include "script_component.hpp" params ["_actionIndex"]; TRACE_1(_this); diff --git a/addons/common/fnc_removeWeapon.sqf b/addons/common/fnc_removeWeapon.sqf index 290a20165..9ab435e1f 100644 --- a/addons/common/fnc_removeWeapon.sqf +++ b/addons/common/fnc_removeWeapon.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeWeapon @@ -22,7 +23,6 @@ Examples: Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(removeWeapon); params [["_unit", objNull, [objNull]], ["_item", "", [""]]]; diff --git a/addons/common/fnc_removeWeaponCargo.sqf b/addons/common/fnc_removeWeaponCargo.sqf index 7a2e12984..7af49f297 100644 --- a/addons/common/fnc_removeWeaponCargo.sqf +++ b/addons/common/fnc_removeWeaponCargo.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeWeaponCargo @@ -31,7 +32,6 @@ Examples: Author: silencer.helling3r 2012-12-22, Jonpas ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(removeWeaponCargo); params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_keepAttachments", false, [true]]]; diff --git a/addons/common/fnc_selectWeapon.sqf b/addons/common/fnc_selectWeapon.sqf index 82d7b9cc7..d29ad260d 100644 --- a/addons/common/fnc_selectWeapon.sqf +++ b/addons/common/fnc_selectWeapon.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_selectWeapon @@ -24,7 +25,6 @@ Examples: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(selectWeapon); #define MAXIMUM_TRIES 100 diff --git a/addons/common/fnc_setCallsign.sqf b/addons/common/fnc_setCallsign.sqf index 75a23f50d..ddd9ab594 100644 --- a/addons/common/fnc_setCallsign.sqf +++ b/addons/common/fnc_setCallsign.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_setCallsign @@ -21,7 +22,6 @@ Example: Author: snippers, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(setCallsign); params [["_group", grpNull, [grpNull, objNull]], ["_callsign", "", [""]]]; diff --git a/addons/common/fnc_setHeight.sqf b/addons/common/fnc_setHeight.sqf index be358f767..b97719f38 100644 --- a/addons/common/fnc_setHeight.sqf +++ b/addons/common/fnc_setHeight.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_setHeight @@ -20,7 +21,6 @@ Returns: Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(setHeight); params [["_object", objNull, [objNull]], ["_height", 0, [0]], ["_type", 1, [0]]]; diff --git a/addons/common/fnc_setPos.sqf b/addons/common/fnc_setPos.sqf index e7aabef2b..746063f8b 100644 --- a/addons/common/fnc_setPos.sqf +++ b/addons/common/fnc_setPos.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_setPos @@ -20,7 +21,6 @@ Returns: Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(setPos); params [ diff --git a/addons/common/fnc_switchPlayer.sqf b/addons/common/fnc_switchPlayer.sqf index a4d856407..371d7a6e3 100644 --- a/addons/common/fnc_switchPlayer.sqf +++ b/addons/common/fnc_switchPlayer.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_switchPlayer @@ -29,8 +30,6 @@ Examples: Author: ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" SCRIPT(switchPlayer); params ["_type"]; diff --git a/addons/common/fnc_turretDir.sqf b/addons/common/fnc_turretDir.sqf index c3d253dda..97aa6d569 100644 --- a/addons/common/fnc_turretDir.sqf +++ b/addons/common/fnc_turretDir.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_turretDir @@ -22,7 +23,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(turretDir); params [["_vehicle", objNull, [objNull]], ["_turret", [-1], [[]]], ["_relativeToModel", false, [false]]]; diff --git a/addons/common/fnc_turretPath.sqf b/addons/common/fnc_turretPath.sqf index 65da3ee6c..05d1a328f 100644 --- a/addons/common/fnc_turretPath.sqf +++ b/addons/common/fnc_turretPath.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_turretPath @@ -20,7 +21,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(turretPath); params [["_unit", objNull, [objNull]]]; diff --git a/addons/common/fnc_turretPathWeapon.sqf b/addons/common/fnc_turretPathWeapon.sqf index 59665a3c1..d3b54ba53 100644 --- a/addons/common/fnc_turretPathWeapon.sqf +++ b/addons/common/fnc_turretPathWeapon.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_turretPathWeapon @@ -21,7 +22,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(turretPathWeapon); params [["_vehicle", objNull, [objNull]], ["_weapon", "", [""]]]; diff --git a/addons/common/fnc_uniqueUnitItems.sqf b/addons/common/fnc_uniqueUnitItems.sqf index da71aa848..952f570cb 100644 --- a/addons/common/fnc_uniqueUnitItems.sqf +++ b/addons/common/fnc_uniqueUnitItems.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_uniqueUnitItems @@ -23,7 +24,6 @@ Returns: Author: Dedmen ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(uniqueUnitItems); params [["_unit", objNull, [objNull]], ["_weaponItems", false, [true]], ["_backpack", true, [true]], ["_vest", true, [true]], ["_uniform", true, [true]], ["_assignedItems", true, [true]]]; diff --git a/addons/common/fnc_vehicleRole.sqf b/addons/common/fnc_vehicleRole.sqf index 9a1d019e2..1e8523e18 100644 --- a/addons/common/fnc_vehicleRole.sqf +++ b/addons/common/fnc_vehicleRole.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_vehicleRole @@ -20,7 +21,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(vehicleRole); params [["_unit", objNull, [objNull]]]; diff --git a/addons/common/fnc_viewDir.sqf b/addons/common/fnc_viewDir.sqf index 2d33b67bc..5fbe38483 100644 --- a/addons/common/fnc_viewDir.sqf +++ b/addons/common/fnc_viewDir.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_viewDir @@ -23,7 +24,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(viewDir); params [["_vehicle", objNull, [objNull]], ["_weapon", nil, [""]]]; diff --git a/addons/common/fnc_waitAndExecute.sqf b/addons/common/fnc_waitAndExecute.sqf index 21a6cb504..4a6f02919 100644 --- a/addons/common/fnc_waitAndExecute.sqf +++ b/addons/common/fnc_waitAndExecute.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_waitAndExecute @@ -24,7 +25,6 @@ Examples: Author: esteldunedain and PabstMirror, donated from ACE3 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_function", {}, [{}]], ["_args", []], ["_delay", 0, [0]]]; diff --git a/addons/common/fnc_waitUntilAndExecute.sqf b/addons/common/fnc_waitUntilAndExecute.sqf index 5dcf7f388..05b74af61 100644 --- a/addons/common/fnc_waitUntilAndExecute.sqf +++ b/addons/common/fnc_waitUntilAndExecute.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_waitUntilAndExecute @@ -33,7 +34,6 @@ Examples: Author: joko // Jonas, donated from ACE3 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [ ["_condition", {}, [{}]], diff --git a/addons/common/fnc_weaponComponents.sqf b/addons/common/fnc_weaponComponents.sqf index d6a001838..b08d8667d 100644 --- a/addons/common/fnc_weaponComponents.sqf +++ b/addons/common/fnc_weaponComponents.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_weaponComponents @@ -23,7 +24,6 @@ Examples: Author: commy2, based on BIS_fnc_weaponComponents by Jiri Wainar ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(weaponComponents); params [["_weapon", "", [""]]]; diff --git a/addons/diagnostic/fnc_addUnitTrackProjectiles.sqf b/addons/diagnostic/fnc_addUnitTrackProjectiles.sqf index ac7713164..cc374b0da 100644 --- a/addons/diagnostic/fnc_addUnitTrackProjectiles.sqf +++ b/addons/diagnostic/fnc_addUnitTrackProjectiles.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addUnitTrackProjectiles @@ -19,7 +20,6 @@ Examples: Author: bux578 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_unit", objNull]]; diff --git a/addons/diagnostic/fnc_debug.sqf b/addons/diagnostic/fnc_debug.sqf index 779fa9536..bf169397a 100644 --- a/addons/diagnostic/fnc_debug.sqf +++ b/addons/diagnostic/fnc_debug.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_debug @@ -26,7 +27,6 @@ Examples: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" // function to split lines into multiple lines with a maxium length #define MAX_LINE_LENGTH 120 diff --git a/addons/diagnostic/fnc_error.sqf b/addons/diagnostic/fnc_error.sqf index 644a15a34..6ba4239b1 100644 --- a/addons/diagnostic/fnc_error.sqf +++ b/addons/diagnostic/fnc_error.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_fnc_error @@ -21,7 +22,6 @@ Returns: Author: Spooner, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(error); params [ diff --git a/addons/diagnostic/fnc_initTargetDebugConsole.sqf b/addons/diagnostic/fnc_initTargetDebugConsole.sqf index be45eb7ef..643a9da9a 100644 --- a/addons/diagnostic/fnc_initTargetDebugConsole.sqf +++ b/addons/diagnostic/fnc_initTargetDebugConsole.sqf @@ -1,3 +1,5 @@ +#include "\a3\ui_f\hpp\defineResinclDesign.inc" +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_diagnostic_fnc_initTargetDebugConsole @@ -11,10 +13,6 @@ Author: commy2 ---------------------------------------------------------------------------- */ -//#define DEBUG_MODE_FULL -#include "\a3\ui_f\hpp\defineResinclDesign.inc" -#include "script_component.hpp" - #define COUNT_WATCH_BOXES 8 if !(getMissionConfigValue ["EnableTargetDebug", 0] == 1 || {getNumber (configFile >> "EnableTargetDebug") == 1}) exitWith {}; diff --git a/addons/diagnostic/fnc_log.sqf b/addons/diagnostic/fnc_log.sqf index e4aaa8a7e..e59aaa7e0 100644 --- a/addons/diagnostic/fnc_log.sqf +++ b/addons/diagnostic/fnc_log.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_fnc_log @@ -15,7 +16,6 @@ Returns: Author: Spooner, Rommel, commy2 -----------------------------------------------------------------------------*/ -#include "script_component.hpp" SCRIPT(log); params [["_message", "", [""]]]; diff --git a/addons/diagnostic/fnc_projectileTracking_drawProjectilePaths.sqf b/addons/diagnostic/fnc_projectileTracking_drawProjectilePaths.sqf index b2c30ae81..fe0d941dd 100644 --- a/addons/diagnostic/fnc_projectileTracking_drawProjectilePaths.sqf +++ b/addons/diagnostic/fnc_projectileTracking_drawProjectilePaths.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_diagnostic_fnc_projectileTracking_drawProjectilePaths @@ -21,7 +22,6 @@ Examples: Author: bux578 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" private _maxLines = GVAR(projectileMaxLines) min 20; diff --git a/addons/diagnostic/fnc_projectileTracking_handleFired.sqf b/addons/diagnostic/fnc_projectileTracking_handleFired.sqf index 4d7e7104a..dd5177937 100644 --- a/addons/diagnostic/fnc_projectileTracking_handleFired.sqf +++ b/addons/diagnostic/fnc_projectileTracking_handleFired.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_diagnostic_fnc_projectileTracking_handleFired @@ -18,7 +19,6 @@ Examples: Author: bux578 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params ["", "", "", "", "", "", "_projectile"]; diff --git a/addons/diagnostic/fnc_projectileTracking_trackProjectile.sqf b/addons/diagnostic/fnc_projectileTracking_trackProjectile.sqf index e9fa2c002..34665d953 100644 --- a/addons/diagnostic/fnc_projectileTracking_trackProjectile.sqf +++ b/addons/diagnostic/fnc_projectileTracking_trackProjectile.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_diagnostic_fnc_projectileTracking_trackProjectile @@ -22,7 +23,6 @@ Examples: Author: bux578 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params ["_args", "_handle"]; _args params ["_projectile", "_index", "_initialProjectileData"]; diff --git a/addons/diagnostic/fnc_removeUnitTrackProjectiles.sqf b/addons/diagnostic/fnc_removeUnitTrackProjectiles.sqf index 9c2e648a5..551006274 100644 --- a/addons/diagnostic/fnc_removeUnitTrackProjectiles.sqf +++ b/addons/diagnostic/fnc_removeUnitTrackProjectiles.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeUnitTrackProjectiles @@ -18,7 +19,6 @@ Examples: Author: bux578 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_unit", objNull]]; diff --git a/addons/diagnostic/fnc_test.sqf b/addons/diagnostic/fnc_test.sqf index 4eb7d2e9c..004eed2b6 100644 --- a/addons/diagnostic/fnc_test.sqf +++ b/addons/diagnostic/fnc_test.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_test @@ -34,8 +35,6 @@ Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - // ---------------------------------------------------------------------------- DEFAULT_PARAM(0,_addon,"cba"); diff --git a/addons/events/fnc_addBISEventHandler.sqf b/addons/events/fnc_addBISEventHandler.sqf index 059cfa076..60bce4abe 100644 --- a/addons/events/fnc_addBISEventHandler.sqf +++ b/addons/events/fnc_addBISEventHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addBISEventHandler @@ -24,7 +25,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addBISEventHandler); params [ diff --git a/addons/events/fnc_addDisplayHandler.sqf b/addons/events/fnc_addDisplayHandler.sqf index cfb3d8b42..96c6d1f88 100644 --- a/addons/events/fnc_addDisplayHandler.sqf +++ b/addons/events/fnc_addDisplayHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addDisplayHandler @@ -22,7 +23,6 @@ Examples: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addDisplayHandler); if (!hasInterface) exitWith {-1}; diff --git a/addons/events/fnc_addEventHandler.sqf b/addons/events/fnc_addEventHandler.sqf index 2887d9a2d..f228b95ed 100644 --- a/addons/events/fnc_addEventHandler.sqf +++ b/addons/events/fnc_addEventHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addEventHandler @@ -19,7 +20,6 @@ Examples: Author: Spooner, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addEventHandler); [{ diff --git a/addons/events/fnc_addEventHandlerArgs.sqf b/addons/events/fnc_addEventHandlerArgs.sqf index 21d4c5832..5e53d39d3 100644 --- a/addons/events/fnc_addEventHandlerArgs.sqf +++ b/addons/events/fnc_addEventHandlerArgs.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addEventHandlerArgs @@ -32,7 +33,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addEventHandlerArgs); params [["_eventName", "", [""]], ["_eventFunc", nil, [{}]], ["_arguments", []]]; diff --git a/addons/events/fnc_addKeyHandler.sqf b/addons/events/fnc_addKeyHandler.sqf index 61478cf04..75494d123 100644 --- a/addons/events/fnc_addKeyHandler.sqf +++ b/addons/events/fnc_addKeyHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addKeyHandler @@ -24,7 +25,6 @@ Examples: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addKeyHandler); if (!hasInterface) exitWith {""}; diff --git a/addons/events/fnc_addKeyHandlerFromConfig.sqf b/addons/events/fnc_addKeyHandlerFromConfig.sqf index 454e3957a..ff0e50bdb 100644 --- a/addons/events/fnc_addKeyHandlerFromConfig.sqf +++ b/addons/events/fnc_addKeyHandlerFromConfig.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addKeyHandlerFromConfig @@ -21,7 +22,6 @@ Examples: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addKeyHandlerFromConfig); if (!hasInterface) exitWith {""}; diff --git a/addons/events/fnc_addMarkerEventHandler.sqf b/addons/events/fnc_addMarkerEventHandler.sqf index 419a7987b..7570d4adb 100644 --- a/addons/events/fnc_addMarkerEventHandler.sqf +++ b/addons/events/fnc_addMarkerEventHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addMarkerEventHandler @@ -19,7 +20,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addMarkerEventHandler); params [["_eventType", "", [""]], ["_function", {}, [{}]]]; diff --git a/addons/events/fnc_addPlayerEventHandler.sqf b/addons/events/fnc_addPlayerEventHandler.sqf index 4e222fa54..7543c9fa0 100644 --- a/addons/events/fnc_addPlayerEventHandler.sqf +++ b/addons/events/fnc_addPlayerEventHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addPlayerEventHandler @@ -32,7 +33,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addPlayerEventHandler); if (!hasInterface) exitWith {-1}; diff --git a/addons/events/fnc_changeKeyHandler.sqf b/addons/events/fnc_changeKeyHandler.sqf index eeae5e85d..4b04fdebe 100644 --- a/addons/events/fnc_changeKeyHandler.sqf +++ b/addons/events/fnc_changeKeyHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_changeKeyHandler @@ -21,7 +22,6 @@ Examples: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(changeKeyHandler); if (!hasInterface) exitWith {}; diff --git a/addons/events/fnc_globalEvent.sqf b/addons/events/fnc_globalEvent.sqf index 77fea92ea..b4a73b4e3 100644 --- a/addons/events/fnc_globalEvent.sqf +++ b/addons/events/fnc_globalEvent.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_globalEvent @@ -19,7 +20,6 @@ Examples: Author: Spooner, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(globalEvent); params [["_eventName", "", [""]], ["_params", []]]; diff --git a/addons/events/fnc_globalEventJIP.sqf b/addons/events/fnc_globalEventJIP.sqf index 595ec74dd..e9bc70646 100644 --- a/addons/events/fnc_globalEventJIP.sqf +++ b/addons/events/fnc_globalEventJIP.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_globalEventJIP @@ -18,7 +19,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(globalEventJIP); params [["_eventName", "", [""]], ["_params", []], ["_jipID", "", [""]]]; diff --git a/addons/events/fnc_keyHandler.sqf b/addons/events/fnc_keyHandler.sqf index c27793116..2cb7ebbe6 100644 --- a/addons/events/fnc_keyHandler.sqf +++ b/addons/events/fnc_keyHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_events_fnc_keyHandler @@ -7,8 +8,6 @@ Description: Author: commy2 ---------------------------------------------------------------------------- */ -// #define DEBUG_MODE_FULL -#include "script_component.hpp" SCRIPT(keyHandler); params ["_args", "_type"]; diff --git a/addons/events/fnc_keyHandlerDown.sqf b/addons/events/fnc_keyHandlerDown.sqf index c1d2dd479..1adeb5157 100644 --- a/addons/events/fnc_keyHandlerDown.sqf +++ b/addons/events/fnc_keyHandlerDown.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_events_fnc_keyHandlerDown @@ -7,8 +8,6 @@ Description: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -// #define DEBUG_MODE_FULL -#include "script_component.hpp" SCRIPT(keyHandlerDown); params ["", "_inputKey"]; diff --git a/addons/events/fnc_keyHandlerUp.sqf b/addons/events/fnc_keyHandlerUp.sqf index b54a51ecd..cfda462cf 100644 --- a/addons/events/fnc_keyHandlerUp.sqf +++ b/addons/events/fnc_keyHandlerUp.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_events_fnc_keyHandlerUp @@ -7,8 +8,6 @@ Description: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -// #define DEBUG_MODE_FULL -#include "script_component.hpp" SCRIPT(keyHandlerUp); params ["", "_inputKey"]; diff --git a/addons/events/fnc_localEvent.sqf b/addons/events/fnc_localEvent.sqf index 6ec07c15c..c15b4caf0 100644 --- a/addons/events/fnc_localEvent.sqf +++ b/addons/events/fnc_localEvent.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_localEvent @@ -19,7 +20,6 @@ Examples: Author: Spooner, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(localEvent); params [["_eventName", "", [""]], ["_params", []]]; diff --git a/addons/events/fnc_mouseHandlerDown.sqf b/addons/events/fnc_mouseHandlerDown.sqf index a7e467b8c..bf7aa0b72 100644 --- a/addons/events/fnc_mouseHandlerDown.sqf +++ b/addons/events/fnc_mouseHandlerDown.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_events_fnc_mouseHandlerDown @@ -7,8 +8,6 @@ Description: Author: commy2 ---------------------------------------------------------------------------- */ -// #define DEBUG_MODE_FULL -#include "script_component.hpp" SCRIPT(mouseHandlerDown); params ["_display", "_inputButton"]; diff --git a/addons/events/fnc_mouseHandlerUp.sqf b/addons/events/fnc_mouseHandlerUp.sqf index 1d55a88b6..d96f1aa57 100644 --- a/addons/events/fnc_mouseHandlerUp.sqf +++ b/addons/events/fnc_mouseHandlerUp.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_events_fnc_mouseHandlerUp @@ -7,8 +8,6 @@ Description: Author: commy2 ---------------------------------------------------------------------------- */ -// #define DEBUG_MODE_FULL -#include "script_component.hpp" SCRIPT(mouseHandlerUp); params ["_display", "_inputButton"]; diff --git a/addons/events/fnc_mouseWheelHandler.sqf b/addons/events/fnc_mouseWheelHandler.sqf index 1d80eb9ba..6dee4d023 100644 --- a/addons/events/fnc_mouseWheelHandler.sqf +++ b/addons/events/fnc_mouseWheelHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_events_fnc_mouseWheelHandler @@ -7,8 +8,6 @@ Description: Author: commy2 ---------------------------------------------------------------------------- */ -// #define DEBUG_MODE_FULL -#include "script_component.hpp" SCRIPT(mouseWheelHandler); params ["_display", "_inputDirection"]; diff --git a/addons/events/fnc_ownerEvent.sqf b/addons/events/fnc_ownerEvent.sqf index 3b0417a89..9bd4afc5c 100644 --- a/addons/events/fnc_ownerEvent.sqf +++ b/addons/events/fnc_ownerEvent.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_ownerEvent @@ -20,7 +21,6 @@ Examples: Author: PabstMirror ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(ownerEvent); params [["_eventName", "", [""]], ["_params", []], ["_targetOwner", -1, [0]]]; diff --git a/addons/events/fnc_readKeyFromConfig.sqf b/addons/events/fnc_readKeyFromConfig.sqf index 9c5b162e3..b6d366c55 100644 --- a/addons/events/fnc_readKeyFromConfig.sqf +++ b/addons/events/fnc_readKeyFromConfig.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_readKeyFromConfig @@ -20,7 +21,6 @@ Examples: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(readKeyFromConfig); params [["_component", "", [""]], ["_action", "", [""]]]; diff --git a/addons/events/fnc_registerChatCommand.sqf b/addons/events/fnc_registerChatCommand.sqf index 4adf23aec..1ef95e361 100644 --- a/addons/events/fnc_registerChatCommand.sqf +++ b/addons/events/fnc_registerChatCommand.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_registerChatCommand @@ -25,7 +26,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(registerChatCommand); if (isNil QGVAR(customChatCommands)) then { diff --git a/addons/events/fnc_remoteEvent.sqf b/addons/events/fnc_remoteEvent.sqf index 789e8c0f3..c96428940 100644 --- a/addons/events/fnc_remoteEvent.sqf +++ b/addons/events/fnc_remoteEvent.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_remoteEvent @@ -19,7 +20,6 @@ Examples: Author: Spooner, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(remoteEvent); params [["_eventName", "", [""]], ["_params", []]]; diff --git a/addons/events/fnc_removeDisplayHandler.sqf b/addons/events/fnc_removeDisplayHandler.sqf index fde59b441..9d0578fe8 100644 --- a/addons/events/fnc_removeDisplayHandler.sqf +++ b/addons/events/fnc_removeDisplayHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeDisplayHandler @@ -19,7 +20,6 @@ Examples: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(removeDisplayHandler); if (!hasInterface) exitWith {}; diff --git a/addons/events/fnc_removeEventHandler.sqf b/addons/events/fnc_removeEventHandler.sqf index 833ea1367..6fbab7ecd 100644 --- a/addons/events/fnc_removeEventHandler.sqf +++ b/addons/events/fnc_removeEventHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeEventHandler @@ -19,7 +20,6 @@ Examples: Author: Spooner, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(removeEventHandler); params [["_eventName", "", [""]], ["_eventId", -1, [0]]]; diff --git a/addons/events/fnc_removeGlobalEventJIP.sqf b/addons/events/fnc_removeGlobalEventJIP.sqf index c7f9df891..60f99bdaa 100644 --- a/addons/events/fnc_removeGlobalEventJIP.sqf +++ b/addons/events/fnc_removeGlobalEventJIP.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeGlobalEventJIP @@ -14,7 +15,6 @@ Returns: Author: PabstMirror (idea from Dystopian) ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(removeGlobalEventJIP); params [["_jipID", "", [""]], ["_object", objNull, [objNull]]]; diff --git a/addons/events/fnc_removeKeyHandler.sqf b/addons/events/fnc_removeKeyHandler.sqf index 406eed9b2..f2a04166b 100644 --- a/addons/events/fnc_removeKeyHandler.sqf +++ b/addons/events/fnc_removeKeyHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeKeyHandler @@ -20,7 +21,6 @@ Examples: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(removeKeyHandler); if (!hasInterface) exitWith {}; diff --git a/addons/events/fnc_removeMarkerEventHandler.sqf b/addons/events/fnc_removeMarkerEventHandler.sqf index 12f604acc..1ea20da04 100644 --- a/addons/events/fnc_removeMarkerEventHandler.sqf +++ b/addons/events/fnc_removeMarkerEventHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeMarkerEventHandler @@ -19,7 +20,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(removeMarkerEventHandler); params [["_eventType", "", [""]], ["_eventId", -1, [0]]]; diff --git a/addons/events/fnc_removePlayerEventHandler.sqf b/addons/events/fnc_removePlayerEventHandler.sqf index ea7f4f7c2..35e98f96a 100644 --- a/addons/events/fnc_removePlayerEventHandler.sqf +++ b/addons/events/fnc_removePlayerEventHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removePlayerEventHandler @@ -19,7 +20,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(removePlayerEventHandler); params [["_type", "", [""]], ["_id", -1, [0]]]; diff --git a/addons/events/fnc_serverEvent.sqf b/addons/events/fnc_serverEvent.sqf index a7ffbc1d7..b39c159e7 100644 --- a/addons/events/fnc_serverEvent.sqf +++ b/addons/events/fnc_serverEvent.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_serverEvent @@ -19,7 +20,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(serverEvent); params [["_eventName", "", [""]], ["_params", []]]; diff --git a/addons/events/fnc_targetEvent.sqf b/addons/events/fnc_targetEvent.sqf index 224e795ba..e6a3e75b0 100644 --- a/addons/events/fnc_targetEvent.sqf +++ b/addons/events/fnc_targetEvent.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_targetEvent @@ -20,7 +21,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(targetEvent); params [["_eventName", "", [""]], ["_params", []], ["_targets", objNull, [objNull, grpNull, []]]]; diff --git a/addons/events/fnc_userKeyHandler.sqf b/addons/events/fnc_userKeyHandler.sqf index 9da1748a7..d3a611d94 100644 --- a/addons/events/fnc_userKeyHandler.sqf +++ b/addons/events/fnc_userKeyHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_events_fnc_userKeyHandler @@ -7,7 +8,6 @@ Description: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" if (GVAR(skipCheckingUserActions)) exitWith {}; diff --git a/addons/events/fnc_weaponEvents.sqf b/addons/events/fnc_weaponEvents.sqf index 8636f2c38..a3ae9670a 100644 --- a/addons/events/fnc_weaponEvents.sqf +++ b/addons/events/fnc_weaponEvents.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_weaponEvents @@ -25,7 +26,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params ["_unit", "_weapon", "_muzzle"]; diff --git a/addons/hashes/fnc_deserializeNamespace.sqf b/addons/hashes/fnc_deserializeNamespace.sqf index c18cc2ce8..28347b5e1 100644 --- a/addons/hashes/fnc_deserializeNamespace.sqf +++ b/addons/hashes/fnc_deserializeNamespace.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_deserializeNamespace @@ -20,7 +21,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(deserializeNamespace); params [["_hash", [], [[]]], ["_isGlobal", false, [false]]]; diff --git a/addons/hashes/fnc_hashCreate.sqf b/addons/hashes/fnc_hashCreate.sqf index 7eb419711..0052466b2 100644 --- a/addons/hashes/fnc_hashCreate.sqf +++ b/addons/hashes/fnc_hashCreate.sqf @@ -1,3 +1,5 @@ +#include "script_component.hpp" +#include "script_hashes.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_hashCreate @@ -26,9 +28,6 @@ Author: Spooner ---------------------------------------------------------------------------- */ -#include "script_component.hpp" -#include "script_hashes.hpp" - SCRIPT(hashCreate); // ----------------------------------------------------------------------------- diff --git a/addons/hashes/fnc_hashEachPair.sqf b/addons/hashes/fnc_hashEachPair.sqf index 00f86b2b7..dacc39daa 100644 --- a/addons/hashes/fnc_hashEachPair.sqf +++ b/addons/hashes/fnc_hashEachPair.sqf @@ -1,3 +1,5 @@ +#include "script_component.hpp" +#include "script_hashes.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_hashEachPair @@ -29,9 +31,6 @@ Example: Author: Spooner ---------------------------------------------------------------------------- */ -//#define DEBUG_MODE_FULL -#include "script_component.hpp" -#include "script_hashes.hpp" SCRIPT(hashEachPair); diff --git a/addons/hashes/fnc_hashFilter.sqf b/addons/hashes/fnc_hashFilter.sqf index bc314b426..1ba68dff1 100644 --- a/addons/hashes/fnc_hashFilter.sqf +++ b/addons/hashes/fnc_hashFilter.sqf @@ -1,3 +1,5 @@ +#include "script_component.hpp" +#include "script_hashes.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_hashFilter @@ -31,9 +33,6 @@ Example: Author: PabstMirror ---------------------------------------------------------------------------- */ -//#define DEBUG_MODE_FULL -#include "script_component.hpp" -#include "script_hashes.hpp" SCRIPT(hashFilter); diff --git a/addons/hashes/fnc_hashGet.sqf b/addons/hashes/fnc_hashGet.sqf index ab847e3d6..7dbcd0703 100644 --- a/addons/hashes/fnc_hashGet.sqf +++ b/addons/hashes/fnc_hashGet.sqf @@ -1,3 +1,5 @@ +#include "script_component.hpp" +#include "script_hashes.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_hashGet @@ -17,9 +19,6 @@ Author: Spooner ---------------------------------------------------------------------------- */ -#include "script_component.hpp" -#include "script_hashes.hpp" - SCRIPT(hashGet); // ----------------------------------------------------------------------------- diff --git a/addons/hashes/fnc_hashHasKey.sqf b/addons/hashes/fnc_hashHasKey.sqf index c05f54a05..cec77584e 100644 --- a/addons/hashes/fnc_hashHasKey.sqf +++ b/addons/hashes/fnc_hashHasKey.sqf @@ -1,3 +1,5 @@ +#include "script_component.hpp" +#include "script_hashes.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_hashHasKey @@ -17,9 +19,6 @@ Author: Spooner ---------------------------------------------------------------------------- */ -#include "script_component.hpp" -#include "script_hashes.hpp" - SCRIPT(hashHasKey); // ----------------------------------------------------------------------------- diff --git a/addons/hashes/fnc_hashKeys.sqf b/addons/hashes/fnc_hashKeys.sqf index fdb1224c2..b72668895 100644 --- a/addons/hashes/fnc_hashKeys.sqf +++ b/addons/hashes/fnc_hashKeys.sqf @@ -1,3 +1,5 @@ +#include "script_component.hpp" +#include "script_hashes.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_hashKeys @@ -15,10 +17,6 @@ Returns: Author: Dedmen ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" -#include "script_hashes.hpp" - SCRIPT(hashKeys); // ----------------------------------------------------------------------------- diff --git a/addons/hashes/fnc_hashRem.sqf b/addons/hashes/fnc_hashRem.sqf index a493f6565..7aedffef9 100644 --- a/addons/hashes/fnc_hashRem.sqf +++ b/addons/hashes/fnc_hashRem.sqf @@ -1,3 +1,5 @@ +#include "script_component.hpp" +#include "script_hashes.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_hashRem @@ -17,9 +19,6 @@ Author: Sickboy ---------------------------------------------------------------------------- */ -#include "script_component.hpp" -#include "script_hashes.hpp" - SCRIPT(hashRem); // ---------------------------------------------------------------------------- diff --git a/addons/hashes/fnc_hashSet.sqf b/addons/hashes/fnc_hashSet.sqf index 187252c85..4b483d96b 100644 --- a/addons/hashes/fnc_hashSet.sqf +++ b/addons/hashes/fnc_hashSet.sqf @@ -1,3 +1,5 @@ +#include "script_component.hpp" +#include "script_hashes.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_hashSet @@ -17,10 +19,6 @@ Returns: Author: Spooner ---------------------------------------------------------------------------- */ -//#define DEBUG_MODE_FULL -#include "script_component.hpp" -#include "script_hashes.hpp" - SCRIPT(hashSet); // ---------------------------------------------------------------------------- diff --git a/addons/hashes/fnc_hashSize.sqf b/addons/hashes/fnc_hashSize.sqf index 04534fa88..6fe14fd2b 100644 --- a/addons/hashes/fnc_hashSize.sqf +++ b/addons/hashes/fnc_hashSize.sqf @@ -1,3 +1,5 @@ +#include "script_component.hpp" +#include "script_hashes.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_hashSize @@ -23,9 +25,6 @@ Author: Killswitch ---------------------------------------------------------------------------- */ -#include "script_component.hpp" -#include "script_hashes.hpp" - SCRIPT(hashSize); params ["_hash"]; diff --git a/addons/hashes/fnc_isHash.sqf b/addons/hashes/fnc_isHash.sqf index b372ea5c1..3f713f2ec 100644 --- a/addons/hashes/fnc_isHash.sqf +++ b/addons/hashes/fnc_isHash.sqf @@ -1,3 +1,5 @@ +#include "script_component.hpp" +#include "script_hashes.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_isHash @@ -16,9 +18,6 @@ Author: Spooner ---------------------------------------------------------------------------- */ -#include "script_component.hpp" -#include "script_hashes.hpp" - SCRIPT(isHash); // ----------------------------------------------------------------------------- diff --git a/addons/hashes/fnc_parseYAML.sqf b/addons/hashes/fnc_parseYAML.sqf index d23631243..1e614406c 100644 --- a/addons/hashes/fnc_parseYAML.sqf +++ b/addons/hashes/fnc_parseYAML.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_parseYAML @@ -15,7 +16,6 @@ Returns: Author: Spooner ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(parseYAML); #include "\x\cba\addons\strings\script_strings.hpp" diff --git a/addons/hashes/fnc_serializeNamespace.sqf b/addons/hashes/fnc_serializeNamespace.sqf index d39125dc4..098b42b01 100644 --- a/addons/hashes/fnc_serializeNamespace.sqf +++ b/addons/hashes/fnc_serializeNamespace.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_serializeNamespace @@ -19,7 +20,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(serializeNamespace); params [["_namespace", locationNull, [locationNull, objNull]]]; diff --git a/addons/help/fnc_setCreditsLine.sqf b/addons/help/fnc_setCreditsLine.sqf index 7962dc563..f89340f09 100644 --- a/addons/help/fnc_setCreditsLine.sqf +++ b/addons/help/fnc_setCreditsLine.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_help_fnc_setCreditsLine @@ -11,8 +12,6 @@ Parameters: Returns: None ---------------------------------------------------------------------------- */ -//#define DEBUG_MODE_FULL -#include "script_component.hpp" params ["_control"]; diff --git a/addons/help/fnc_setVersionLine.sqf b/addons/help/fnc_setVersionLine.sqf index 4848a62e1..42ae24f25 100644 --- a/addons/help/fnc_setVersionLine.sqf +++ b/addons/help/fnc_setVersionLine.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_help_fnc_setVersionLine @@ -14,8 +15,6 @@ Parameters: Returns: None ---------------------------------------------------------------------------- */ -//#define DEBUG_MODE_FULL -#include "script_component.hpp" params ["_control", ["_key", 0]]; diff --git a/addons/jr/fnc_compatibleItems.sqf b/addons/jr/fnc_compatibleItems.sqf index ad6e89f66..7acd57d41 100644 --- a/addons/jr/fnc_compatibleItems.sqf +++ b/addons/jr/fnc_compatibleItems.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_compatibleItems @@ -20,7 +21,6 @@ Examples: Author: Original by Karel Moricky, Enhanced by Robalo, jokoho, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(compatibleItems); params [["_weapon", "", [""]], ["_typefilter", nil, ["", 0]]]; diff --git a/addons/keybinding/fnc_addKeybind.sqf b/addons/keybinding/fnc_addKeybind.sqf index 0228ca857..f56a89cf7 100644 --- a/addons/keybinding/fnc_addKeybind.sqf +++ b/addons/keybinding/fnc_addKeybind.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addKeybind @@ -57,7 +58,6 @@ Examples: Author: Taosenai & Nou, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" // clients only. if (!hasInterface) exitWith {}; diff --git a/addons/keybinding/fnc_addKeybindToFleximenu.sqf b/addons/keybinding/fnc_addKeybindToFleximenu.sqf index 1097e9cce..6e1518e24 100644 --- a/addons/keybinding/fnc_addKeybindToFleximenu.sqf +++ b/addons/keybinding/fnc_addKeybindToFleximenu.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addKeybindToFleximenu @@ -30,8 +31,6 @@ Examples: Author: ViperMaul ---------------------------------------------------------------------------- */ -//#define DEBUG_MODE_FULL -#include "script_component.hpp" // Clients only. if (isDedicated) exitWith {}; diff --git a/addons/keybinding/fnc_getKeybind.sqf b/addons/keybinding/fnc_getKeybind.sqf index e4b0d2970..f51bab01a 100644 --- a/addons/keybinding/fnc_getKeybind.sqf +++ b/addons/keybinding/fnc_getKeybind.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getKeybind @@ -33,8 +34,6 @@ Author: Taosenai ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - params ["_addon", "_addonAction"]; TRACE_2("getKeybind",_addon,_addonAction); diff --git a/addons/keybinding/fnc_localizeKey.sqf b/addons/keybinding/fnc_localizeKey.sqf index 6fb92b226..1e17406ed 100644 --- a/addons/keybinding/fnc_localizeKey.sqf +++ b/addons/keybinding/fnc_localizeKey.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_localizeKey @@ -21,7 +22,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_key", 0, [0]], ["_modifier", [], [[], false]]]; diff --git a/addons/keybinding/fnc_registerKeybind.sqf b/addons/keybinding/fnc_registerKeybind.sqf index df7d25e9e..cb585b842 100644 --- a/addons/keybinding/fnc_registerKeybind.sqf +++ b/addons/keybinding/fnc_registerKeybind.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_registerKeybind @@ -6,9 +7,6 @@ This function is deprecated, please use CBA_fnc_addKeybind. This function will N Author: Nou ---------------------------------------------------------------------------- */ -//#define DEBUG_MODE_FULL -#include "script_component.hpp" - // Clients only. if (isDedicated) exitWith {}; diff --git a/addons/keybinding/fnc_registerKeybindModPrettyName.sqf b/addons/keybinding/fnc_registerKeybindModPrettyName.sqf index 4dff696c0..7f4280e1c 100644 --- a/addons/keybinding/fnc_registerKeybindModPrettyName.sqf +++ b/addons/keybinding/fnc_registerKeybindModPrettyName.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_registerKeybindModPrettyName @@ -18,7 +19,6 @@ Examples: Author: Nou ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params ["_addonName", "_prettyName"]; diff --git a/addons/keybinding/fnc_registerKeybindToFleximenu.sqf b/addons/keybinding/fnc_registerKeybindToFleximenu.sqf index 7c74c2646..a858f3eff 100644 --- a/addons/keybinding/fnc_registerKeybindToFleximenu.sqf +++ b/addons/keybinding/fnc_registerKeybindToFleximenu.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_registerKeybindToFleximenu @@ -28,8 +29,6 @@ Author: Taosenai ---------------------------------------------------------------------------- */ -#include "\x\cba\addons\keybinding\script_component.hpp" - // Clients only. if (isDedicated) exitWith {}; diag_log text format ["[CBA Keybinding] WARNING: %1=>%2 called CBA_fnc_registerKeybindToFleximenu is no longer a valid function and has been replaced with CBA_fnc_addKeybindToFleximenu. Contact the developer of mod %1 to change the code to use the new function.", _this select 0,_this select 1]; diff --git a/addons/modules/fnc_getPosFromString.sqf b/addons/modules/fnc_getPosFromString.sqf index 8ba2b3bec..327f0e88f 100644 --- a/addons/modules/fnc_getPosFromString.sqf +++ b/addons/modules/fnc_getPosFromString.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getPosFromString @@ -27,8 +28,6 @@ Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - params [ ["_type",""], ["_string",""] diff --git a/addons/modules/fnc_moduleAttack.sqf b/addons/modules/fnc_moduleAttack.sqf index 2d02a0cfe..9df689e8b 100644 --- a/addons/modules/fnc_moduleAttack.sqf +++ b/addons/modules/fnc_moduleAttack.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_moduleAttack @@ -33,8 +34,6 @@ Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - params [ ["_logic",objNull,[objNull]], ["_groups",[],[[]]], diff --git a/addons/modules/fnc_moduleDefend.sqf b/addons/modules/fnc_moduleDefend.sqf index 2b02b9c67..882ae33ab 100644 --- a/addons/modules/fnc_moduleDefend.sqf +++ b/addons/modules/fnc_moduleDefend.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_moduleDefend @@ -33,8 +34,6 @@ Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - params [ ["_logic", objNull, [objNull]], ["_groups", [], [[]]], diff --git a/addons/modules/fnc_modulePatrol.sqf b/addons/modules/fnc_modulePatrol.sqf index 4e3940996..02e162676 100644 --- a/addons/modules/fnc_modulePatrol.sqf +++ b/addons/modules/fnc_modulePatrol.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_modulePatrol @@ -47,8 +48,6 @@ Author: ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - params [ ["_logic", objNull, [objNull]], ["_groups", [], [[]]], diff --git a/addons/music/fnc_compileMusic.sqf b/addons/music/fnc_compileMusic.sqf index b897d62c9..c76a6d627 100644 --- a/addons/music/fnc_compileMusic.sqf +++ b/addons/music/fnc_compileMusic.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_compileMusic @@ -18,7 +19,6 @@ Example: Author: Fishy, Dorbedo, Dedmen ---------------------------------------------------------------------------- */ -#include "script_component.hpp" if (isNil QGVARMAIN(compiledMusic)) then { private _allMusic = configProperties [MissionConfigFile >> "CfgMusic", "(getNumber (_x >> 'duration')) > 0", true]; diff --git a/addons/music/fnc_findMusic.sqf b/addons/music/fnc_findMusic.sqf index 6b8a6d9ef..ae7766867 100644 --- a/addons/music/fnc_findMusic.sqf +++ b/addons/music/fnc_findMusic.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_findMusic @@ -20,7 +21,6 @@ Example: Author: Fishy, Dedmen, Dorbedo ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_searchType", "any", ["", []]], ["_searchTags", "any", ["", []]], ["_searchTracks", ([] call CBA_fnc_compileMusic), [[]]]]; diff --git a/addons/music/fnc_getMusicData.sqf b/addons/music/fnc_getMusicData.sqf index 857c20d39..c96bd632d 100644 --- a/addons/music/fnc_getMusicData.sqf +++ b/addons/music/fnc_getMusicData.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getMusicData @@ -20,7 +21,6 @@ Example: Author: Fishy, Dedmen ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [ ["_config", "", ["", configFile]], diff --git a/addons/music/fnc_getMusicPath.sqf b/addons/music/fnc_getMusicPath.sqf index 0d1e4f401..dd7bedca7 100644 --- a/addons/music/fnc_getMusicPath.sqf +++ b/addons/music/fnc_getMusicPath.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getMusicPath @@ -18,7 +19,6 @@ Example: Authors: Fishy, Dorbedo ---------------------------------------------------------------------------- */ -#include "script_component.hpp" if (!params [["_className", "", ["", configFile]]]) exitWith {WARNING('No classname was provided'); nil}; diff --git a/addons/music/fnc_getMusicPlaying.sqf b/addons/music/fnc_getMusicPlaying.sqf index 964b85533..60e5b32ca 100644 --- a/addons/music/fnc_getMusicPlaying.sqf +++ b/addons/music/fnc_getMusicPlaying.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_getMusicPlaying @@ -18,7 +19,6 @@ Example: Author: Fishy, Dedmen ---------------------------------------------------------------------------- */ -#include "script_component.hpp" if (isNil QGVAR(track)) exitWith {["", 0, 0]}; diff --git a/addons/music/fnc_isMusicPlaying.sqf b/addons/music/fnc_isMusicPlaying.sqf index 335a85916..3057c5ef1 100644 --- a/addons/music/fnc_isMusicPlaying.sqf +++ b/addons/music/fnc_isMusicPlaying.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_isMusicPlaying @@ -18,6 +19,5 @@ Example: Author: Dedmen, Commy2, Fishy ---------------------------------------------------------------------------- */ -#include "script_component.hpp" !isNil QGVAR(track) diff --git a/addons/music/fnc_playMusic.sqf b/addons/music/fnc_playMusic.sqf index 477ab59f6..cf7160d0a 100644 --- a/addons/music/fnc_playMusic.sqf +++ b/addons/music/fnc_playMusic.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_playMusic @@ -20,7 +21,6 @@ Example: Author: Fishy, Dedmen ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_className", "", ["", configFile]], ["_time", 0, [0]], ["_overWrite", true, [true]]]; diff --git a/addons/music/fnc_stopMusic.sqf b/addons/music/fnc_stopMusic.sqf index 4c5106f60..98c1a0597 100644 --- a/addons/music/fnc_stopMusic.sqf +++ b/addons/music/fnc_stopMusic.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_stopMusic @@ -18,7 +19,6 @@ Example: Author: Fishy ---------------------------------------------------------------------------- */ -#include "script_component.hpp" playMusic ["", 0]; GVAR(track) = nil; diff --git a/addons/network/fnc_globalExecute.sqf b/addons/network/fnc_globalExecute.sqf index 75efdc439..eec5523f0 100644 --- a/addons/network/fnc_globalExecute.sqf +++ b/addons/network/fnc_globalExecute.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_globalExecute @@ -22,7 +23,6 @@ Example: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_channel", CBA_SEND_TO_ALL, [CBA_SEND_TO_ALL]], ["_code", {}, [{}]], ["_parameters", []]]; diff --git a/addons/network/fnc_globalSay.sqf b/addons/network/fnc_globalSay.sqf index 6e8b70b91..a6b44d31c 100644 --- a/addons/network/fnc_globalSay.sqf +++ b/addons/network/fnc_globalSay.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_globalSay @@ -21,7 +22,6 @@ Example: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_objects", [], [[], objNull]], ["_params", "", ["", []]]]; diff --git a/addons/network/fnc_globalSay3d.sqf b/addons/network/fnc_globalSay3d.sqf index f2fe7a931..febe02519 100644 --- a/addons/network/fnc_globalSay3d.sqf +++ b/addons/network/fnc_globalSay3d.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_globalSay3d @@ -22,7 +23,6 @@ Example: Author: Sickboy, commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_objects", [], [[], objNull]], ["_params", "", ["", []]], ["_distance", nil, [0]]]; diff --git a/addons/network/fnc_publicVariable.sqf b/addons/network/fnc_publicVariable.sqf index 6f2f0831b..e51bd01dd 100644 --- a/addons/network/fnc_publicVariable.sqf +++ b/addons/network/fnc_publicVariable.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_publicVariable @@ -24,8 +25,6 @@ Example: Author: Xeno, commy2 ---------------------------------------------------------------------------- */ -//#define DEBUG_MODE_FULL -#include "script_component.hpp" params [["_varName", "", [""]], "_value"]; diff --git a/addons/network/fnc_setVarNet.sqf b/addons/network/fnc_setVarNet.sqf index 5df343548..5c9da6738 100644 --- a/addons/network/fnc_setVarNet.sqf +++ b/addons/network/fnc_setVarNet.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_setVarNet @@ -25,8 +26,6 @@ Example: Author: Xeno, commy2 ---------------------------------------------------------------------------- */ -//#define DEBUG_MODE_FULL -#include "script_component.hpp" params [["_object", objNull, [objNull, grpNull]], ["_varName", "", [""]], "_value"]; diff --git a/addons/settings/fnc_check.sqf b/addons/settings/fnc_check.sqf index e1a80a00d..4cfb7692d 100644 --- a/addons/settings/fnc_check.sqf +++ b/addons/settings/fnc_check.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_settings_fnc_check @@ -14,7 +15,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_setting", "", [""]], "_value"]; diff --git a/addons/settings/fnc_clear.sqf b/addons/settings/fnc_clear.sqf index 01772f496..00811a213 100644 --- a/addons/settings/fnc_clear.sqf +++ b/addons/settings/fnc_clear.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_settings_fnc_clear @@ -13,7 +14,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_source", "client", [""]]]; diff --git a/addons/settings/fnc_export.sqf b/addons/settings/fnc_export.sqf index 302b0ef2d..76ccefd7a 100644 --- a/addons/settings/fnc_export.sqf +++ b/addons/settings/fnc_export.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_settings_fnc_export @@ -15,7 +16,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_source", "client", [""]], ["_exportDefault", true, [false]]]; diff --git a/addons/settings/fnc_get.sqf b/addons/settings/fnc_get.sqf index 9035d4c02..66ac4ba38 100644 --- a/addons/settings/fnc_get.sqf +++ b/addons/settings/fnc_get.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_settings_fnc_get @@ -19,7 +20,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_setting", "", [""]], ["_source", "priority", [""]]]; diff --git a/addons/settings/fnc_gui_refresh.sqf b/addons/settings/fnc_gui_refresh.sqf index 99951c7e1..e4ae0b193 100644 --- a/addons/settings/fnc_gui_refresh.sqf +++ b/addons/settings/fnc_gui_refresh.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_settings_fnc_gui_refresh @@ -13,7 +14,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" private _display = uiNamespace getVariable [QGVAR(display), displayNull]; private _controls = allControls _display select {ctrlIDC _x isEqualTo IDC_SETTING_CONTROLS_GROUP}; diff --git a/addons/settings/fnc_gui_saveTempData.sqf b/addons/settings/fnc_gui_saveTempData.sqf index 55593438c..a263c523a 100644 --- a/addons/settings/fnc_gui_saveTempData.sqf +++ b/addons/settings/fnc_gui_saveTempData.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_settings_fnc_gui_saveTempData @@ -13,7 +14,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" { private _setting = _x; diff --git a/addons/settings/fnc_import.sqf b/addons/settings/fnc_import.sqf index fe3d3bc91..77937df76 100644 --- a/addons/settings/fnc_import.sqf +++ b/addons/settings/fnc_import.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_settings_fnc_import @@ -14,7 +15,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_info", "", [""]], ["_source", "client", [""]]]; diff --git a/addons/settings/fnc_init.sqf b/addons/settings/fnc_init.sqf index 2d0562b38..1f7e9aee5 100644 --- a/addons/settings/fnc_init.sqf +++ b/addons/settings/fnc_init.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_settings_fnc_init @@ -39,7 +40,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" // prevent race conditions. function could be called from scheduled env. if (canSuspend) exitWith { diff --git a/addons/settings/fnc_parse.sqf b/addons/settings/fnc_parse.sqf index 29afe23f1..a4b892db9 100644 --- a/addons/settings/fnc_parse.sqf +++ b/addons/settings/fnc_parse.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_settings_fnc_parse @@ -14,7 +15,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" // parses bool, number, string private _fnc_parseAny = { diff --git a/addons/settings/fnc_priority.sqf b/addons/settings/fnc_priority.sqf index abd6236ac..35eea6a55 100644 --- a/addons/settings/fnc_priority.sqf +++ b/addons/settings/fnc_priority.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_settings_fnc_priority @@ -16,7 +17,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_setting", "", [""]], ["_source", "priority", [""]]]; diff --git a/addons/settings/fnc_set.sqf b/addons/settings/fnc_set.sqf index d0faa8601..8c974aa9f 100644 --- a/addons/settings/fnc_set.sqf +++ b/addons/settings/fnc_set.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_settings_fnc_set @@ -22,7 +23,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" // prevent race conditions. function could be called from scheduled env. if (canSuspend) exitWith { diff --git a/addons/settings/fnc_whitelisted.sqf b/addons/settings/fnc_whitelisted.sqf index ff5cf0a19..793379203 100644 --- a/addons/settings/fnc_whitelisted.sqf +++ b/addons/settings/fnc_whitelisted.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Internal Function: CBA_settings_fnc_whitelisted @@ -18,7 +19,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" private _uid = getPlayerUID player; private _whitelist = getArray (configFile >> QGVAR(whitelist)); diff --git a/addons/statemachine/fnc_addEventTransition.sqf b/addons/statemachine/fnc_addEventTransition.sqf index 4887795f7..5a844f654 100644 --- a/addons/statemachine/fnc_addEventTransition.sqf +++ b/addons/statemachine/fnc_addEventTransition.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_statemachine_fnc_addEventTransition @@ -32,7 +33,6 @@ Examples: Author: BaerMitUmlaut ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addEventTransition); params [ ["_stateMachine", locationNull, [locationNull]], diff --git a/addons/statemachine/fnc_addState.sqf b/addons/statemachine/fnc_addState.sqf index 260c7d6fc..e260a0906 100644 --- a/addons/statemachine/fnc_addState.sqf +++ b/addons/statemachine/fnc_addState.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_statemachine_fnc_addState @@ -30,7 +31,6 @@ Examples: Author: BaerMitUmlaut ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addState); params [ ["_stateMachine", locationNull, [locationNull]], diff --git a/addons/statemachine/fnc_addTransition.sqf b/addons/statemachine/fnc_addTransition.sqf index 59eb01629..d80bbe4d2 100644 --- a/addons/statemachine/fnc_addTransition.sqf +++ b/addons/statemachine/fnc_addTransition.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_statemachine_fnc_addTransition @@ -30,7 +31,6 @@ Examples: Author: BaerMitUmlaut ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(addTransition); params [ ["_stateMachine", locationNull, [locationNull]], diff --git a/addons/statemachine/fnc_clockwork.sqf b/addons/statemachine/fnc_clockwork.sqf index d1170fc8c..97a85296f 100644 --- a/addons/statemachine/fnc_clockwork.sqf +++ b/addons/statemachine/fnc_clockwork.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_statemachine_fnc_clockwork @@ -13,7 +14,6 @@ Returns: Author: BaerMitUmlaut ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(clockwork); { diff --git a/addons/statemachine/fnc_create.sqf b/addons/statemachine/fnc_create.sqf index bc7e377d9..757ca699e 100644 --- a/addons/statemachine/fnc_create.sqf +++ b/addons/statemachine/fnc_create.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_statemachine_fnc_create @@ -23,7 +24,6 @@ Examples: Author: BaerMitUmlaut ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(create); params [ ["_list", [], [[], {}]], diff --git a/addons/statemachine/fnc_createFromConfig.sqf b/addons/statemachine/fnc_createFromConfig.sqf index 5ca6d726f..c82bdfd09 100644 --- a/addons/statemachine/fnc_createFromConfig.sqf +++ b/addons/statemachine/fnc_createFromConfig.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_statemachine_fnc_createFromConfig @@ -20,7 +21,6 @@ Examples: Author: BaerMitUmlaut ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(createFromConfig); params [["_config", configNull, [configNull]]]; diff --git a/addons/statemachine/fnc_delete.sqf b/addons/statemachine/fnc_delete.sqf index 03a007df3..670776858 100644 --- a/addons/statemachine/fnc_delete.sqf +++ b/addons/statemachine/fnc_delete.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_statemachine_fnc_delete @@ -18,7 +19,6 @@ Examples: Author: BaerMitUmlaut ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(delete); params [["_stateMachine", locationNull, [locationNull]]]; diff --git a/addons/statemachine/fnc_dumpPerformanceCounters.sqf b/addons/statemachine/fnc_dumpPerformanceCounters.sqf index b23ae6700..d705f5a6b 100644 --- a/addons/statemachine/fnc_dumpPerformanceCounters.sqf +++ b/addons/statemachine/fnc_dumpPerformanceCounters.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_statemachine_fnc_dumpPerformanceCounters @@ -20,7 +21,6 @@ Examples: Author: PabstMirror ---------------------------------------------------------------------------- */ -#include "script_component.hpp" #ifndef STATEMACHINE_PERFORMANCE_COUNTERS if (true) exitWith {WARNING("Requires `STATEMACHINE_PERFORMANCE_COUNTERS` in script_component.hpp");}; diff --git a/addons/statemachine/fnc_getCurrentState.sqf b/addons/statemachine/fnc_getCurrentState.sqf index 60ba93d75..09fc5df4d 100644 --- a/addons/statemachine/fnc_getCurrentState.sqf +++ b/addons/statemachine/fnc_getCurrentState.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_statemachine_fnc_getCurrentState @@ -19,7 +20,6 @@ Examples: Author: BaerMitUmlaut ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(getCurrentState); params [ ["_listItem", objNull, [missionNamespace, objNull, grpNull, teamMemberNull, taskNull, locationNull]], diff --git a/addons/statemachine/fnc_manualTransition.sqf b/addons/statemachine/fnc_manualTransition.sqf index 9fd232dfe..dde13ae10 100644 --- a/addons/statemachine/fnc_manualTransition.sqf +++ b/addons/statemachine/fnc_manualTransition.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_statemachine_fnc_manualTransition @@ -30,7 +31,6 @@ Examples: Author: BaerMitUmlaut ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(manualTransition); params [ ["_listItem", objNull, [missionNamespace, objNull, grpNull, teamMemberNull, taskNull, locationNull]], diff --git a/addons/statemachine/fnc_toString.sqf b/addons/statemachine/fnc_toString.sqf index 845a00f1b..e353aac80 100644 --- a/addons/statemachine/fnc_toString.sqf +++ b/addons/statemachine/fnc_toString.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_statemachine_fnc_toString @@ -22,7 +23,6 @@ Examples: Author: BaerMitUmlaut ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(toString); params [ ["_stateMachine", locationNull, [locationNull]], diff --git a/addons/statemachine/fnc_updateList.sqf b/addons/statemachine/fnc_updateList.sqf index 516b57169..905a947a4 100644 --- a/addons/statemachine/fnc_updateList.sqf +++ b/addons/statemachine/fnc_updateList.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_statemachine_fnc_updateList @@ -20,7 +21,6 @@ Examples: Author: BaerMitUmlaut ---------------------------------------------------------------------------- */ -#include "script_component.hpp" SCRIPT(updateList); params [ ["_stateMachine", locationNull, [locationNull]], diff --git a/addons/strings/fnc_capitalize.sqf b/addons/strings/fnc_capitalize.sqf index 08c079f28..82c1a1fb5 100644 --- a/addons/strings/fnc_capitalize.sqf +++ b/addons/strings/fnc_capitalize.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_capitalize @@ -22,13 +23,8 @@ Examples: Author: Spooner, joko // Jonas ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" - SCRIPT(capitalize); -// ---------------------------------------------------------------------------- - params ["_string"]; private _charCount = count _string; @@ -41,4 +37,4 @@ if (_charCount > 0) then { _string = _string1 + _string2; }; -_string; // Return. +_string diff --git a/addons/strings/fnc_find.sqf b/addons/strings/fnc_find.sqf index 0c8842f54..fe504343f 100644 --- a/addons/strings/fnc_find.sqf +++ b/addons/strings/fnc_find.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_find @@ -28,13 +29,8 @@ Examples: Author: jaynus ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" - SCRIPT(find); -// ---------------------------------------------------------------------------- - params ["_haystack", "_needle", ["_initialIndex", 0]]; if !(_haystack isEqualType "") exitWith {-1}; diff --git a/addons/strings/fnc_leftTrim.sqf b/addons/strings/fnc_leftTrim.sqf index 1e8959fb3..e81cf1e40 100644 --- a/addons/strings/fnc_leftTrim.sqf +++ b/addons/strings/fnc_leftTrim.sqf @@ -1,3 +1,5 @@ +#include "script_component.hpp" +#include "script_strings.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_leftTrim @@ -22,14 +24,8 @@ Example: Author: Spooner, joko // Jonas, SilentSpike ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" -#include "script_strings.hpp" - SCRIPT(leftTrim); -// ---------------------------------------------------------------------------- - params ["_string", ["_trim", "", [""]]]; private _chars = toArray _string; diff --git a/addons/strings/fnc_removeWhitespace.sqf b/addons/strings/fnc_removeWhitespace.sqf index cdb0c637c..c376dc47f 100644 --- a/addons/strings/fnc_removeWhitespace.sqf +++ b/addons/strings/fnc_removeWhitespace.sqf @@ -1,3 +1,5 @@ +#include "script_component.hpp" +#include "script_strings.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_removeWhitespace @@ -23,8 +25,6 @@ Example: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" -#include "script_strings.hpp" SCRIPT(removeWhitespace); params [["_string", "", [""]], ["_seperate", false, [true]]]; diff --git a/addons/strings/fnc_replace.sqf b/addons/strings/fnc_replace.sqf index ff2430935..4e3d321f5 100644 --- a/addons/strings/fnc_replace.sqf +++ b/addons/strings/fnc_replace.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_replace @@ -21,9 +22,6 @@ Example: Author: BaerMitUmlaut --------------------------------------------------------------------------- */ - -#include "script_component.hpp" - SCRIPT(replace); params [["_string", "", [""]], ["_find", "", [""]], ["_replace", "", [""]]]; diff --git a/addons/strings/fnc_rightTrim.sqf b/addons/strings/fnc_rightTrim.sqf index be96ba34a..e23559b79 100644 --- a/addons/strings/fnc_rightTrim.sqf +++ b/addons/strings/fnc_rightTrim.sqf @@ -1,3 +1,5 @@ +#include "script_component.hpp" +#include "script_strings.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_rightTrim @@ -22,14 +24,8 @@ Example: Author: Spooner, joko // Jonas, SilentSpike ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" -#include "script_strings.hpp" - SCRIPT(rightTrim); -// ---------------------------------------------------------------------------- - params ["_string", ["_trim", "", [""]]]; private _chars = toArray _string; diff --git a/addons/strings/fnc_split.sqf b/addons/strings/fnc_split.sqf index 6a8302555..8074417f9 100644 --- a/addons/strings/fnc_split.sqf +++ b/addons/strings/fnc_split.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_split @@ -24,13 +25,8 @@ Examples: Author: PabstMirror ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" - SCRIPT(split); -// ---------------------------------------------------------------------------- - params [["_input", ""], ["_separator", ""]]; private _split = []; diff --git a/addons/strings/fnc_strLen.sqf b/addons/strings/fnc_strLen.sqf index 93c90214e..78c81b52b 100644 --- a/addons/strings/fnc_strLen.sqf +++ b/addons/strings/fnc_strLen.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_strLen @@ -22,11 +23,6 @@ Examples: Author: Spooner ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" - SCRIPT(strLen); -// ---------------------------------------------------------------------------- - -count (_this select 0); // Return. +count (_this select 0) // return diff --git a/addons/strings/fnc_substr.sqf b/addons/strings/fnc_substr.sqf index cfa7f038c..891a77040 100644 --- a/addons/strings/fnc_substr.sqf +++ b/addons/strings/fnc_substr.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_substr @@ -23,16 +24,12 @@ Example: Author: joko // Jonas --------------------------------------------------------------------------- */ - -#include "script_component.hpp" - SCRIPT(substr); -// ---------------------------------------------------------------------------- params ["_string", "_startIndex", "_length"]; // Check if _length is set else extract string to end if (isNil "_length" || {_length <= 0}) exitWith {_string select [_startIndex];}; // Cut out String -_string select [_startIndex, _length]; // Return +_string select [_startIndex, _length] // return diff --git a/addons/strings/fnc_substring.sqf b/addons/strings/fnc_substring.sqf index 60888a26f..c01039dd7 100644 --- a/addons/strings/fnc_substring.sqf +++ b/addons/strings/fnc_substring.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_substring @@ -21,12 +22,8 @@ Example: Author: jaynus, joko // Jonas --------------------------------------------------------------------------- */ - -#include "script_component.hpp" - SCRIPT(substring); -// ---------------------------------------------------------------------------- params ["_string", "_startIndex", "_endIndex"]; // Check if _start is Larger than _endIndex to Prevent Issues @@ -36,4 +33,4 @@ if (_startIndex > _endIndex) exitWith {""}; _endIndex = _endIndex + 1 - _startIndex; // Cut out String -_string select [_startIndex, _endIndex]; // Return +_string select [_startIndex, _endIndex] // return diff --git a/addons/strings/fnc_trim.sqf b/addons/strings/fnc_trim.sqf index 23e8e6785..6fa74cc62 100644 --- a/addons/strings/fnc_trim.sqf +++ b/addons/strings/fnc_trim.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_trim @@ -22,13 +23,8 @@ Example: Author: Spooner, SilentSpike ---------------------------------------------------------------------------- */ - -#include "script_component.hpp" - SCRIPT(trim); -// ---------------------------------------------------------------------------- - params ["_string", ["_trim", "", [""]]]; _string = [_string, _trim] call CBA_fnc_rightTrim; diff --git a/addons/ui/fnc_addPauseMenuOption.sqf b/addons/ui/fnc_addPauseMenuOption.sqf index 28a92332d..64c364ebe 100644 --- a/addons/ui/fnc_addPauseMenuOption.sqf +++ b/addons/ui/fnc_addPauseMenuOption.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addPauseMenuOption @@ -19,7 +20,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_name", "", ["", []]], ["_dialog", "", [""]]]; _name params [["_displayName", "", [""]], ["_tooltip", "", [""]]]; diff --git a/addons/ui/fnc_progressBar.sqf b/addons/ui/fnc_progressBar.sqf index ae32d0df0..1042bc69c 100644 --- a/addons/ui/fnc_progressBar.sqf +++ b/addons/ui/fnc_progressBar.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_progressBar @@ -36,7 +37,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" // no progress bar without interface if (!hasInterface) exitWith {}; diff --git a/addons/vectors/fnc_polar2vect.sqf b/addons/vectors/fnc_polar2vect.sqf index 9d68081a4..05caf8a8e 100644 --- a/addons/vectors/fnc_polar2vect.sqf +++ b/addons/vectors/fnc_polar2vect.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_polar2vect @@ -22,7 +23,6 @@ Author: ---------------------------------------------------------------------------- */ scriptName "fnc_polar2vect.sqf"; -#include "script_component.hpp" SCRIPT(polar2vect); params ["_mag", "_dir", "_elev"]; diff --git a/addons/vectors/fnc_scaleVect.sqf b/addons/vectors/fnc_scaleVect.sqf index 2e12488ba..491724f8c 100644 --- a/addons/vectors/fnc_scaleVect.sqf +++ b/addons/vectors/fnc_scaleVect.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_scaleVect @@ -21,7 +22,6 @@ Author: ---------------------------------------------------------------------------- */ scriptName "fnc_scaleVect.sqf"; -#include "script_component.hpp" SCRIPT(scaleVect); params ["_vect", "_factor"]; diff --git a/addons/vectors/fnc_scaleVectTo.sqf b/addons/vectors/fnc_scaleVectTo.sqf index b97501321..c4556f93a 100644 --- a/addons/vectors/fnc_scaleVectTo.sqf +++ b/addons/vectors/fnc_scaleVectTo.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_scaleVectTo @@ -23,7 +24,6 @@ Author: ---------------------------------------------------------------------------- */ scriptName "fnc_scaleVectTo.sqf"; -#include "script_component.hpp" SCRIPT(scaleVectTo); params ["_vect", "_newMagn"]; diff --git a/addons/vectors/fnc_simplifyAngle.sqf b/addons/vectors/fnc_simplifyAngle.sqf index 2c82027a7..66458d33b 100644 --- a/addons/vectors/fnc_simplifyAngle.sqf +++ b/addons/vectors/fnc_simplifyAngle.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_simplifyAngle @@ -21,8 +22,6 @@ Author: SilentSpike 2015-27-07 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - params ["_angle"]; // Return simplified angle diff --git a/addons/vectors/fnc_simplifyAngle180.sqf b/addons/vectors/fnc_simplifyAngle180.sqf index bc68477cf..1f7593cc8 100644 --- a/addons/vectors/fnc_simplifyAngle180.sqf +++ b/addons/vectors/fnc_simplifyAngle180.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_simplifyAngle180 @@ -21,8 +22,6 @@ Author: SilentSpike 2015-27-07 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - params ["_angle"]; // Normalize to 0-360 diff --git a/addons/vectors/fnc_vect2polar.sqf b/addons/vectors/fnc_vect2polar.sqf index 3c30597e5..ec521064d 100644 --- a/addons/vectors/fnc_vect2polar.sqf +++ b/addons/vectors/fnc_vect2polar.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_vect2Polar @@ -21,7 +22,6 @@ Author: ---------------------------------------------------------------------------- */ scriptName "fnc_vect2Polar.sqf"; -#include "script_component.hpp" SCRIPT(vect2Polar); diff --git a/addons/vectors/fnc_vectCross2D.sqf b/addons/vectors/fnc_vectCross2D.sqf index cea6ebb26..15650ab04 100644 --- a/addons/vectors/fnc_vectCross2D.sqf +++ b/addons/vectors/fnc_vectCross2D.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_vectCross2D @@ -24,7 +25,6 @@ Author: ---------------------------------------------------------------------------- */ scriptName "fnc_vectCross2D.sqf"; -#include "script_component.hpp" SCRIPT(vectCross2D); params ["_u", "_v"]; diff --git a/addons/vectors/fnc_vectDir.sqf b/addons/vectors/fnc_vectDir.sqf index 9f67917c3..d9d192f96 100644 --- a/addons/vectors/fnc_vectDir.sqf +++ b/addons/vectors/fnc_vectDir.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_vectDir @@ -20,7 +21,6 @@ Author: ---------------------------------------------------------------------------- */ scriptName "fnc_vectDir.sqf"; -#include "script_component.hpp" SCRIPT(vectDir); diff --git a/addons/vectors/fnc_vectElev.sqf b/addons/vectors/fnc_vectElev.sqf index 03cc8e055..1e9154309 100644 --- a/addons/vectors/fnc_vectElev.sqf +++ b/addons/vectors/fnc_vectElev.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_vectElev @@ -20,10 +21,8 @@ Author: ---------------------------------------------------------------------------- */ scriptName "fnc_vectElev.sqf"; -#include "script_component.hpp" SCRIPT(vectElev); - params ["_pos1", "_pos2"]; private _dist2D = (_this) call CBA_fnc_vectMagn2D; diff --git a/addons/vectors/fnc_vectMagn.sqf b/addons/vectors/fnc_vectMagn.sqf index c3b035e45..1655a32eb 100644 --- a/addons/vectors/fnc_vectMagn.sqf +++ b/addons/vectors/fnc_vectMagn.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_vectMagn @@ -20,7 +21,6 @@ Author: ---------------------------------------------------------------------------- */ scriptName "fnc_vectMagn.sqf"; -#include "script_component.hpp" SCRIPT(vectMagn); vectorMagnitude _this diff --git a/addons/vectors/fnc_vectMagn2D.sqf b/addons/vectors/fnc_vectMagn2D.sqf index 1737c0cc7..a0e43c900 100644 --- a/addons/vectors/fnc_vectMagn2D.sqf +++ b/addons/vectors/fnc_vectMagn2D.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_vectMagn2D @@ -20,7 +21,6 @@ Author: ---------------------------------------------------------------------------- */ scriptName "fnc_vectMagn2D.sqf"; -#include "script_component.hpp" SCRIPT(vectMagn2D); sqrt ((_this select 0) ^ 2 + (_this select 1) ^ 2) diff --git a/addons/vectors/fnc_vectRotate2D.sqf b/addons/vectors/fnc_vectRotate2D.sqf index bb92010b8..1df5e0064 100644 --- a/addons/vectors/fnc_vectRotate2D.sqf +++ b/addons/vectors/fnc_vectRotate2D.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_vectRotate2D @@ -16,8 +17,6 @@ Author: Rommel ---------------------------------------------------------------------------- */ -#include "script_component.hpp" - params ["_center", "_vector", "_angle"]; _center params ["_x", "_y"]; diff --git a/addons/vectors/fnc_vectRotate3D.sqf b/addons/vectors/fnc_vectRotate3D.sqf index 3387da610..67a89480c 100644 --- a/addons/vectors/fnc_vectRotate3D.sqf +++ b/addons/vectors/fnc_vectRotate3D.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_vectRotate3D @@ -24,7 +25,6 @@ Examples: Author: LorenLuke ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params ["_vector", "_rotationAxis", "_theta"]; diff --git a/addons/vectors/fnc_vectSubtract.sqf b/addons/vectors/fnc_vectSubtract.sqf index 3a214fe5f..cee2f90ac 100644 --- a/addons/vectors/fnc_vectSubtract.sqf +++ b/addons/vectors/fnc_vectSubtract.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_vectSubtract @@ -21,7 +22,6 @@ Author: ---------------------------------------------------------------------------- */ scriptName "fnc_vectSubtract.sqf"; -#include "script_component.hpp" SCRIPT(vectSubtract); diff --git a/addons/xeh/fnc_addClassEventHandler.sqf b/addons/xeh/fnc_addClassEventHandler.sqf index 6a7484a42..58c858144 100644 --- a/addons/xeh/fnc_addClassEventHandler.sqf +++ b/addons/xeh/fnc_addClassEventHandler.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_addClassEventHandler @@ -25,7 +26,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_className", "", [""]], ["_eventName", "", [""]], ["_eventFunc", {}, [{}]], ["_allowInheritance", true, [false]], ["_excludedClasses", [], [[]]], ["_applyInitRetroactively", false, [false]]]; diff --git a/addons/xeh/fnc_compileEventHandlers.sqf b/addons/xeh/fnc_compileEventHandlers.sqf index 7919f673f..1181b3dab 100644 --- a/addons/xeh/fnc_compileEventHandlers.sqf +++ b/addons/xeh/fnc_compileEventHandlers.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_compileEventHandlers @@ -20,7 +21,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_baseConfig", configNull, [configNull]]]; diff --git a/addons/xeh/fnc_compileFunction.sqf b/addons/xeh/fnc_compileFunction.sqf index 44d51bb07..b82d0c57e 100644 --- a/addons/xeh/fnc_compileFunction.sqf +++ b/addons/xeh/fnc_compileFunction.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_compileFunction @@ -20,7 +21,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_funcFile", "", [""]], ["_funcName", "", [""]]]; diff --git a/addons/xeh/fnc_init.sqf b/addons/xeh/fnc_init.sqf index f47a516d2..d20f94de7 100644 --- a/addons/xeh/fnc_init.sqf +++ b/addons/xeh/fnc_init.sqf @@ -1,3 +1,5 @@ +#define DEBUG_SYNCHRONOUS +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_init @@ -19,8 +21,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#define DEBUG_SYNCHRONOUS -#include "script_component.hpp" params ["_this"]; diff --git a/addons/xeh/fnc_initEvents.sqf b/addons/xeh/fnc_initEvents.sqf index 962fc4f17..ff26fa3b5 100644 --- a/addons/xeh/fnc_initEvents.sqf +++ b/addons/xeh/fnc_initEvents.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_initEvents @@ -19,7 +20,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params ["_unit"]; diff --git a/addons/xeh/fnc_isRecompileEnabled.sqf b/addons/xeh/fnc_isRecompileEnabled.sqf index fe3f06cf8..2ced9f14d 100644 --- a/addons/xeh/fnc_isRecompileEnabled.sqf +++ b/addons/xeh/fnc_isRecompileEnabled.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_isRecompileEnabled @@ -18,7 +19,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params ["_compileType"]; diff --git a/addons/xeh/fnc_isScheduled.sqf b/addons/xeh/fnc_isScheduled.sqf index 221135c25..1115f3553 100644 --- a/addons/xeh/fnc_isScheduled.sqf +++ b/addons/xeh/fnc_isScheduled.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_isScheduled @@ -18,7 +19,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" private _i = 10001; diff --git a/addons/xeh/fnc_postInit.sqf b/addons/xeh/fnc_postInit.sqf index f8d7ec13f..37a4d4f5c 100644 --- a/addons/xeh/fnc_postInit.sqf +++ b/addons/xeh/fnc_postInit.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_postInit @@ -14,6 +15,5 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" CBA_fnc_postInit_unscheduled call CBA_fnc_directCall; diff --git a/addons/xeh/fnc_postInit_unscheduled.sqf b/addons/xeh/fnc_postInit_unscheduled.sqf index 362b3557f..3cf1046f4 100644 --- a/addons/xeh/fnc_postInit_unscheduled.sqf +++ b/addons/xeh/fnc_postInit_unscheduled.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_postInit_unscheduled @@ -14,7 +15,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" XEH_LOG("XEH: PostInit started. " + PFORMAT_9("MISSIONINIT",missionName,missionVersion,worldName,isMultiplayer,isServer,isDedicated,CBA_isHeadlessClient,hasInterface,didJIP)); diff --git a/addons/xeh/fnc_preInit.sqf b/addons/xeh/fnc_preInit.sqf index 04bdbcdd5..3c37cecf8 100644 --- a/addons/xeh/fnc_preInit.sqf +++ b/addons/xeh/fnc_preInit.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_preInit @@ -14,7 +15,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" if (ISPROCESSED(missionNamespace)) exitWith { diag_log text "[XEH]: preInit already executed. Abort preInit."; diff --git a/addons/xeh/fnc_preStart.sqf b/addons/xeh/fnc_preStart.sqf index 96f23de87..10c4a6362 100644 --- a/addons/xeh/fnc_preStart.sqf +++ b/addons/xeh/fnc_preStart.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_preStart @@ -14,7 +15,6 @@ Returns: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" // mission namespace does not exist yet. // spawned threads will not continue. diff --git a/addons/xeh/fnc_startFallbackLoop.sqf b/addons/xeh/fnc_startFallbackLoop.sqf index 60caf7358..4fadee6d1 100644 --- a/addons/xeh/fnc_startFallbackLoop.sqf +++ b/addons/xeh/fnc_startFallbackLoop.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_startFallbackLoop @@ -19,7 +20,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" if (GVAR(fallbackRunning)) exitWith {}; diff --git a/addons/xeh/fnc_supportMonitor.sqf b/addons/xeh/fnc_supportMonitor.sqf index 8f10a45a3..ad29d22f8 100644 --- a/addons/xeh/fnc_supportMonitor.sqf +++ b/addons/xeh/fnc_supportMonitor.sqf @@ -1,3 +1,4 @@ +#include "script_component.hpp" /* ---------------------------------------------------------------------------- Function: CBA_fnc_supportMonitor @@ -21,7 +22,6 @@ Examples: Author: commy2 ---------------------------------------------------------------------------- */ -#include "script_component.hpp" params [["_addAddonToOutput", false, [false]], ["_includeDuplicates", false, [false]], ["_includeDisabled", false, [false]], ["_classFilter", "", [""]]];