Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3

addons/attach/CfgEventHandlers.hpp

@@ -1,5 +1,5 @@
 class Extended_PreInit_EventHandlers {
   class ADDON {
-    init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) );
+    init = QUOTE( call COMPILE_FILE(XEH_preInit) );
   };
 };

addons/attach/XEH_preInit.sqf

@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
-PREPF(attach);
+PREP(attach);
-PREPF(canAttach);
+PREP(canAttach);
-PREPF(canDetach);
+PREP(canDetach);
-PREPF(detach);
+PREP(detach);
-PREPF(openAttachUI);
+PREP(openAttachUI);

addons/attach/config.cpp

@@ -5,7 +5,7 @@ class CfgPatches {
     units[] = {};
     weapons[] = {"AGM_IR_Strobe_Item"};
     requiredVersion = 0.60;
-    requiredAddons[] = {AGM_Core, AGM_Interaction};
+    requiredAddons[] = {"ace_common", "ace_interaction"};
     version = "0.95";
     versionStr = "0.95";
     versionAr[] = {0,95,0};

addons/attach/functions/fnc_attach.sqf

@@ -29,27 +29,27 @@ switch true do {
   case (_itemName == "AGM_IR_Strobe_Item") : {
     _attachedItem = "AGM_IR_Strobe_Effect" createVehicle [0,0,0];
     _attachedItem attachTo [_unit,[0,-0.11,0.16],"pilot"];//makes it attach to the head a bit better, shoulder is not good for visibility - eRazeri
-    [localize "STR_AGM_Attach_IrStrobe_Attached"] call EFUNC(core,displayTextStructured);
+    [localize "STR_AGM_Attach_IrStrobe_Attached"] call EFUNC(common,displayTextStructured);
   };
   case (_itemName == "B_IR_Grenade") : {
     _attachedItem = "B_IRStrobe" createVehicle [0,0,0];
     _attachedItem attachTo [_unit,[-0.05,0,0.12],"rightshoulder"];
-    [localize "STR_AGM_Attach_IrGrenade_Attached"] call EFUNC(core,displayTextStructured);
+    [localize "STR_AGM_Attach_IrGrenade_Attached"] call EFUNC(common,displayTextStructured);
   };
   case (_itemName == "O_IR_Grenade") : {
     _attachedItem = "O_IRStrobe" createVehicle [0,0,0];
     _attachedItem attachTo [_unit,[-0.05,0,0.12],"rightshoulder"];
-    [localize "STR_AGM_Attach_IrGrenade_Attached"] call EFUNC(core,displayTextStructured);
+    [localize "STR_AGM_Attach_IrGrenade_Attached"] call EFUNC(common,displayTextStructured);
   };
   case (_itemName == "I_IR_Grenade") : {
     _attachedItem = "I_IRStrobe" createVehicle [0,0,0];
     _attachedItem attachTo [_unit,[-0.05,0,0.12],"rightshoulder"];
-    [localize "STR_AGM_Attach_IrGrenade_Attached"] call EFUNC(core,displayTextStructured);
+    [localize "STR_AGM_Attach_IrGrenade_Attached"] call EFUNC(common,displayTextStructured);
   };
   case (_itemName == "Chemlight_blue" or {_itemName == "Chemlight_green"} or {_itemName == "Chemlight_red"} or {_itemName == "Chemlight_yellow"}) : {
     _attachedItem = _itemName createVehicle [0,0,0];
     _attachedItem attachTo [_unit,[-0.05,0,0.12],"rightshoulder"];
-    [localize "STR_AGM_Attach_Chemlight_Attached"] call EFUNC(core,displayTextStructured);;
+    [localize "STR_AGM_Attach_Chemlight_Attached"] call EFUNC(common,displayTextStructured);;
   };
   default {
     if (true) exitWith {};

addons/attach/functions/fnc_detach.sqf

@@ -24,7 +24,7 @@ if (_itemName == "") exitWith {};
 _count = (count items _unit) + (count magazines _unit);
 _unit addItem _itemName;
 if ((count items _unit) + (count magazines _unit) <= _count) exitWith {
-  [localize "STR_AGM_Attach_Inventory_Full"] call EFUNC(core,displayTextStructured);
+  [localize "STR_AGM_Attach_Inventory_Full"] call EFUNC(common,displayTextStructured);
 };
 
 if (_itemName == "B_IR_Grenade" or _itemName == "O_IR_Grenade" or _itemName == "I_IR_Grenade") then {
@@ -51,13 +51,13 @@ _unit setVariable [QGVAR(Item),nil, true];
 // Display message
 switch true do {
   case (_itemName == "AGM_IR_Strobe_Item") : {
-    [localize "STR_AGM_Attach_IrStrobe_Detached"] call EFUNC(core,displayTextStructured);
+    [localize "STR_AGM_Attach_IrStrobe_Detached"] call EFUNC(common,displayTextStructured);
   };
   case (_itemName == "B_IR_Grenade" or _itemName == "O_IR_Grenade" or _itemName == "I_IR_Grenade") : {
-    [localize "STR_AGM_Attach_IrGrenade_Detached"] call EFUNC(core,displayTextStructured);
+    [localize "STR_AGM_Attach_IrGrenade_Detached"] call EFUNC(common,displayTextStructured);
   };
   case (_itemName == "Chemlight_blue" or {_itemName == "Chemlight_green"} or {_itemName == "Chemlight_red"} or {_itemName == "Chemlight_yellow"}) : {
-    [localize "STR_AGM_Attach_Chemlight_Detached"] call EFUNC(core,displayTextStructured);
+    [localize "STR_AGM_Attach_Chemlight_Detached"] call EFUNC(common,displayTextStructured);
   };
   default {
     if (true) exitWith {};

addons/attach/functions/script_component.hpp

@@ -0,0 +1 @@
+#include "\z\ace\addons\attach\script_component.hpp"

addons/common/CfgVehicles.hpp

@@ -33,7 +33,7 @@ class CfgVehicles {
     function = "ACE_Common_fnc_moduleCheckPBOs";
     scope = 2;
     isGlobal = 1;
-    icon = PATHTOF(UI\IconCheckPBO_ca.paa);
+    icon = QUOTE(PATHTOF(UI\IconCheckPBO_ca.paa));
     class Arguments {
       class Action {
         displayName = "Action";

addons/common/MenuConfig.hpp

@@ -366,7 +366,7 @@ class ACE_Common_OptionsMenu_Dialog {
             idc = 300;
             //type = 0;
             style = 48;
-            text = PATHTOF(UI\box_unchecked_ca.paa);
+            text = QUOTE(PATHTOF(UI\box_unchecked_ca.paa));
             colorBackground[] = {0, 0, 0, 0};
             colorText[] = {1, 1, 1, 1};
             x = (HSPACE2 + 3 * 0.1) * safezoneW + safezoneX;

addons/common/functions/script_component.hpp

@@ -0,0 +1 @@
+#include "\z\ace\addons\common\script_component.hpp"

addons/frag/functions/script_component.hpp

@@ -0,0 +1 @@
+#include "\z\ace\addons\frag\script_component.hpp"

addons/interaction/CfgEventHandlers.hpp

@@ -1,12 +1,12 @@
 class Extended_PreInit_EventHandlers {
   class ADDON {
-    init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) );
+    init = QUOTE( call COMPILE_FILE(XEH_preInit) );
   };
 };
 
 class Extended_PostInit_EventHandlers {
   class ADDON {
-    clientInit = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_clientInit.sqf) );
+    clientInit = QUOTE( call COMPILE_FILE(XEH_clientInit) );
   };
 };
 

addons/interaction/config.cpp

@@ -5,7 +5,7 @@ class CfgPatches {
     units[] = {};
     weapons[] = {};
     requiredVersion = 0.60;
-    requiredAddons[] = {ACE_Core};
+    requiredAddons[] = {"ace_common"};
     version = "0.95";
     versionStr = "0.95";
     versionAr[] = {0,95,0};

addons/interaction/functions/fnc_AddSelectableItem.sqf

@@ -26,7 +26,7 @@ _picture = _this select 2;
 _data = _this select 3;
 
 if (_picture == "" || _picture == "PictureThing") then {
-	_picture = PATHTOF(UI\dot_ca.paa);
+	_picture = QUOTE(PATHTOF(UI\dot_ca.paa));
 };
 
 if ((profileNamespace getVariable [QGVAR(FlowMenu), false])) then {

addons/interaction/functions/fnc_GetActions.sqf

@@ -25,7 +25,7 @@
 */
 #include "script_component.hpp"
 
-#define DEFAULT_ICON PATHTOF(UI\dot_ca.paa)
+#define DEFAULT_ICON QUOTE(PATHTOF(UI\dot_ca.paa))
 private ["_target", "_parents", "_actions", "_patches", "_baseConfig", "_actionType", "_i","_index", "_missionConfig", "_stdConfig"];
 _target = _this select 0;
 _parents = _this select 1;
@@ -77,7 +77,7 @@ for "_i" from 0 to (_count - 1) do {
 					_condition = getText (_action >> "condition");
 					if (_condition == "") then {_condition = "true"};
 
-					_condition = _condition + format [QUOTE( && {%1 call EGVAR(core,canInteract)} && {[ACE_player, GVAR(Target)] call EFUNC(core,canInteractWith)} ), getArray (_action >> "exceptions")];
+					_condition = _condition + format [QUOTE( && {%1 call EGVAR(core,canInteract)} && {[ACE_player, GVAR(Target)] call EFUNC(common,canInteractWith)} ), getArray (_action >> "exceptions")];
 					if (_enableInside != 1) then {_condition = _condition + " && {_player == _vehicle}"};
 
 					_condition = compile _condition;

addons/interaction/functions/fnc_getActions2.sqf

@@ -45,7 +45,7 @@ _cacheIndices = _cache select 2;
 			_condition = getText (_action >> "condition");
 			if (_condition == "") then {_condition = "true"};
 
-			_condition = _condition + format [QUOTE( && {%1 call EFUNC(core,canInteract)} && {[ACE_player, GVAR(Target)] call FUNC(canInteractWith)} ), getArray (_action >> "exceptions")];
+			_condition = _condition + format [QUOTE(&& {%1 call EFUNC(common,canInteract)} && {[ACE_player, GVAR(Target)] call FUNC(canInteractWith)}), getArray (_action >> "exceptions")];
 			if (_enableInside != 1) then {_condition = _condition + " && {_player == _vehicle}"};
 
 			_condition = compile _condition;

addons/interaction/functions/fnc_getCaptivityStatus.sqf

@@ -1,4 +1,4 @@
 // by commy2
 #include "script_component.hpp"
 
-_this call EFUNC(core,setCaptivityStatus);
+_this call EFUNC(common,getCaptivityStatus);

addons/interaction/functions/fnc_initialiseInteraction.sqf

@@ -41,10 +41,10 @@ if (_this select 2) then {
 	ACE_Interaction_SelectedButton = 0;
 	(findDisplay 1713999) closeDisplay 1;
 	if (_player getVariable ["ACE_AcceptAction", -1] == -1) then {
-		[{if(isNil {GVAR(MainButton)} || {!(profileNamespace getVariable [QGVAR(FlowMenu), false])})exitWith{false};(-(_this select 0) / 1.2) call FUNC(MoveDown);true}] call EFUNC(core,addScrollWheelEventHandler);
+		[{if(isNil {GVAR(MainButton)} || {!(profileNamespace getVariable [QGVAR(FlowMenu), false])})exitWith{false};(-(_this select 0) / 1.2) call FUNC(MoveDown);true}] call EFUNC(common,addScrollWheelEventHandler);
 
-		_player setVariable ["ACE_AcceptAction", [_player, "DefaultAction", {(!isNil {GVAR(MainButton)}) && {(profileNamespace getVariable [QGVAR(FlowMenu), false])}}, {_action = GVAR(Buttons) select ACE_Interaction_SelectedButton;_target = GVAR(Target);_player = ACE_player;_vehicle = vehicle _player;if ([_target, _player] call (_action select 2)) then {call FUNC(hideMenu);if(count _action == 12) then{(_action select 11) call (_action select 1);}else{[_target, _player] call (_action select 1);};};}] call EFUNC(core,addActionEventHandler)];
+		_player setVariable ["ACE_AcceptAction", [_player, "DefaultAction", {(!isNil {GVAR(MainButton)}) && {(profileNamespace getVariable [QGVAR(FlowMenu), false])}}, {_action = GVAR(Buttons) select ACE_Interaction_SelectedButton;_target = GVAR(Target);_player = ACE_player;_vehicle = vehicle _player;if ([_target, _player] call (_action select 2)) then {call FUNC(hideMenu);if(count _action == 12) then{(_action select 11) call (_action select 1);}else{[_target, _player] call (_action select 1);};};}] call EFUNC(common,addActionEventHandler)];
-		_player setVariable ["ACE_AcceptAction", [_player, "menuBack", {(!isNil {GVAR(MainButton)}) && {(profileNamespace getVariable [QGVAR(FlowMenu), false])}}, {call GVAR(MainButton);}] call EFUNC(core,addActionEventHandler)];
+		_player setVariable ["ACE_AcceptAction", [_player, "menuBack", {(!isNil {GVAR(MainButton)}) && {(profileNamespace getVariable [QGVAR(FlowMenu), false])}}, {call GVAR(MainButton);}] call EFUNC(common,addActionEventHandler)];
 	};
 	0 call FUNC(moveDown);
 	[localize "STR_ACE_Interaction_MakeSelection", if (_subMenu)then{localize "STR_ACE_Interaction_Back"}else{""}, localize "STR_ACE_Interaction_ScrollHint"] call FUNC(showMouseHint);
@@ -59,8 +59,8 @@ if (_this select 2) then {
 
 		(findDisplay 46) createDisplay QGVAR(Dialog);
 		// Add eventhandlers
-		(findDisplay 1713999) displayAddEventHandler ["KeyDown", QUOTE( _this call EFUNC(core,onKeyDown) )];
+		(findDisplay 1713999) displayAddEventHandler ["KeyDown", QUOTE( _this call EFUNC(common,onKeyDown) )];
-		(findDisplay 1713999) displayAddEventHandler ["KeyUp", QUOTE( _this call EFUNC(core,onKeyUp) )];
+		(findDisplay 1713999) displayAddEventHandler ["KeyUp", QUOTE( _this call EFUNC(common,onKeyUp) )];
 
 		(findDisplay 1713999) displayAddEventHandler ["KeyDown", QUOTE( _this call FUNC(menuKeyInput) )];
 	};
@@ -69,7 +69,7 @@ if (_this select 2) then {
 	_ctrlInteractionDialog = _dlgInteractionDialog displayCtrl 3;
 	if (profileNamespace getVariable [QGVAR(AutoCenterCursor), true]) then {setMousePosition [0.5, 0.5]};
 	if !(_subMenu) then {
-		_ctrlInteractionDialog ctrlSetText ([_target] call EFUNC(core,getName));
+		_ctrlInteractionDialog ctrlSetText ([_target] call EFUNC(common,getName));
 	} else {
 		_ctrlInteractionDialog ctrlSetText localize "STR_ACE_Interaction_Back";
 	};
@@ -94,7 +94,7 @@ if (_this select 2) then {
 			_ctrlInteractionDialogShortcut ctrlSetText (_action select 10);
 			//_ctrlInteractionDialogBackground ctrlShow true;
 
-			GVAR(Shortcuts) set [_i, [_action select 10] call EFUNC(core,letterToCode)];
+			GVAR(Shortcuts) set [_i, [_action select 10] call EFUNC(common,letterToCode)];
 		} else {
 			_ctrlInteractionDialog ctrlSetText "";
 			_ctrlInteractionDialog ctrlEnable false;

addons/interaction/functions/fnc_joinTeam.sqf

@@ -7,7 +7,7 @@ _unit = _this select 0;
 _team = _this select 1;
 
 _unit setVariable [QGVAR(assignedFireTeam), _team, true];
-[_unit, format ["{_this assignTeam '%1'}", _team]] call EFUNC(core,execRemoteFnc);
+[_unit, format ["{_this assignTeam '%1'}", _team]] call EFUNC(common,execRemoteFnc);
 
 if (_unit == ACE_player) then {
 	_message = if (_team == "MAIN") then {
@@ -17,5 +17,5 @@ if (_unit == ACE_player) then {
 		format [localize "STR_ACE_Interaction_JoinedTeam", _team];
 	};
 
-	[_message] call EFUNC(core,displayTextStructured);
+	[_message] call EFUNC(common,displayTextStructured);
 };

addons/interaction/functions/fnc_moduleInteraction.sqf

@@ -16,6 +16,6 @@ _activated = _this select 2;
 
 if !(_activated) exitWith {};
 
-[_logic, QGVAR(EnableTeamManagement), "EnableTeamManagement"] call EFUNC(core,readBooleanParameterFromModule);
+[_logic, QGVAR(EnableTeamManagement), "EnableTeamManagement"] call EFUNC(common,readBooleanParameterFromModule);
 
 diag_log text "[ACE]: Interaction Module Initialized.";

addons/interaction/functions/fnc_onButtonDown.sqf

@@ -12,4 +12,4 @@ if (isNull (findDisplay 1713999)) then {
 	(findDisplay 1713999) closeDisplay 1;
 };
 
-[_player, "interactionMenuOpened", [_player, GVAR(Target), 0]] call EFUNC(core,callCustomEventHandlers);
+[_player, "interactionMenuOpened", [_player, GVAR(Target), 0]] call EFUNC(common,callCustomEventHandlers);

addons/interaction/functions/fnc_onButtonDownSelf.sqf

@@ -12,4 +12,4 @@ if (isNull (findDisplay 1713999)) then {
 	(findDisplay 1713999) closeDisplay 1;
 };
 
-[_player, "interactionMenuOpened", [_player, GVAR(Target), 1]] call EFUNC(core,callCustomEventHandlers);
+[_player, "interactionMenuOpened", [_player, GVAR(Target), 1]] call EFUNC(common,callCustomEventHandlers);

addons/interaction/functions/fnc_openMenuSelectUI.sqf

@@ -7,7 +7,7 @@ _unit = _this select 0;
 _vehicle = _this select 1;
 
 // allow interaction with all cargo slots and all ffv slots
-_cargo = [_vehicle, ["cargo", "ffv"], true] call EFUNC(core,getVehicleCrew);
+_cargo = [_vehicle, ["cargo", "ffv"], true] call EFUNC(common,getVehicleCrew);
 
 // you can only interact if you are in cargo or ffv yourself. exit otherwise
 if !(_unit in _cargo) exitWith {};
@@ -23,8 +23,8 @@ _actions = [localize "STR_ACE_Interaction_InteractionMenu", localize "STR_ACE_In
   if (_x != _unit) then {
     _actions = [
       _actions,
-      [_x] call EFUNC(core,getName),
+      [_x] call EFUNC(common,getName),
-      PATHOD(UI\dot_ca.paa),
+      QUOTE(PATHTOF(UI\dot_ca.paa)),
       _forEachIndex
     ] call FUNC(AddSelectableItem);
   };

addons/interaction/functions/fnc_push.sqf

@@ -16,7 +16,7 @@ _boat = _this select 0;
 _velocity = _this select 1;
 
 if !(local _boat) exitWith {
-  [_this, QUOTE(FUNC(push)), _boat] call EFUNC(core,execRemoteFnc);
+  [_this, QUOTE(FUNC(push)), _boat] call EFUNC(common,execRemoteFnc);
 };
 
 _boat setVelocity _velocity;

addons/interaction/functions/fnc_setCaptivityStatus.sqf

@@ -1,4 +1,4 @@
 // by commy2
 #include "script_component.hpp"
 
-_this call EFUNC(core,getCaptivityStatus);
+_this call EFUNC(common,setCaptivityStatus);

addons/interaction/functions/fnc_showMenu.sqf

@@ -23,7 +23,7 @@
 #include "script_component.hpp"
 
 private ["_player", "_vehicle", "_mainButtonAction", "_object", "_index", "_actions", "_result", "_menuType"];
-#define DEFAULT_ICON PATHOF(UI\dot_ca.paa)
+#define DEFAULT_ICON QUOTE(PATHOF(UI\dot_ca.paa))
 #define DEFAULT_DISTANCE 4 // seems to be 4
 _player = ACE_player;
 _vehicle = vehicle _player;
@@ -44,7 +44,7 @@ GVAR(Target) = _this select 1;
 _object = GVAR(Target);
 
 if (_menuType == 0 && {(isNull (_object) || {!([_object, 4] call FUNC(isInRange))})}) exitWith {};
-if !([_player, _object] call EFUNC(core,canInteractWith)) exitWith {};
+if !([_player, _object] call EFUNC(common,canInteractWith)) exitWith {};
 
 // add actions or self actions of GVAR(Target)
 _parents = [configFile >> "CfgVehicles" >> typeOf _object, true] call BIS_fnc_returnParents;

addons/interaction/functions/fnc_tapShoulder.sqf

@@ -15,7 +15,7 @@ if (_target != ACE_player) exitWith {
 
 addCamShake [4, 0.5, 5];
 
-//_message = format ["%1 tapped you on your shoulder.", [_unit] call EFUNC(core,getName)];
+//_message = format ["%1 tapped you on your shoulder.", [_unit] call EFUNC(common,getName)];
 _message = localize "STR_ACE_Interaction_YouWereTapped";
 
-[_message] call EFUNC(core,displayTextStructured);
+[_message] call EFUNC(common,displayTextStructured);

addons/interaction/functions/script_component.hpp

@@ -0,0 +1 @@
+#include "\z\ace\addons\interaction\script_component.hpp"

addons/laser/config.cpp

@@ -5,7 +5,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = REQUIRED_VERSION;
-		requiredAddons[] = { "uo_main", "a3_ui_f" };
+		requiredAddons[] = { "ace_common" };
 		version = VERSION;
 	};
 };

addons/laser/functions/script_component.hpp

@@ -0,0 +1 @@
+#include "\z\ace\addons\laser\script_component.hpp"

addons/main/license.sqf

@@ -0,0 +1,92 @@
+License (short)
+===============
+
+You are free:
+- to Share — to copy, distribute and transmit the work
+
+Under the following conditions:
+- Attribution — You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).
+- Noncommercial — You may not use this work for commercial purposes.
+- No Derivative Works — You may not alter, transform, or build upon this work.
+
+With the understanding that:
+
+Waiver — Any of the above conditions can be waived if you get permission from the copyright holder.
+
+Public Domain — Where the work or any of its elements is in the public domain under applicable law, that status is in no way affected by the license.
+
+Other Rights — In no way are any of the following rights affected by the license:
+	- Your fair dealing or fair use rights, or other applicable copyright exceptions and limitations;
+	- The author's moral rights;
+	- Rights other persons may have either in the work itself or in how the work is used, such as publicity or privacy rights.
+	
+Notice — For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page.
+
+
+Full license text
+=================
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+"Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+"Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License.
+"Distribute" means to make available to the public the original and copies of the Work through sale or other transfer of ownership.
+"Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+"Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+"Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+"You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+"Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+"Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+
+2. Fair Dealing Rights. 
+
+Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+
+3. License Grant. 
+
+Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; and, to Distribute and Publicly Perform the Work including as incorporated in Collections.
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats, but otherwise you have no rights to make Adaptations. Subject to 8(f), all rights not expressly granted by Licensor are hereby reserved, including but not limited to the rights set forth in Section 4(d).
+
+4. Restrictions. 
+
+The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested.
+You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in connection with the exchange of copyrighted works.
+If You Distribute, or Publicly Perform the Work or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work. The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Collection, at a minimum such credit will appear, if a credit for all contributing authors of Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+
+For the avoidance of doubt:
+
+Non-waivable Compulsory License Schemes. 
+
+In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License if Your exercise of such rights is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(b) and otherwise waives the right to collect royalties through any statutory or compulsory licensing scheme; and,
+Voluntary License Schemes. The Licensor reserves the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License that is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(b).
+Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation.
+
+5. Representations, Warranties and Disclaimer.
+
+UNLESS OTHERWISE MUTUALLY AGREED BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination.
+
+This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). 
+
+Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous.
+
+Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.

addons/main/script_macros.hpp

@@ -177,6 +177,10 @@
 #define DGVAR(varName)	if(isNil "ACE_DEBUG_NAMESPACE") then { ACE_DEBUG_NAMESPACE = []; }; if(!(QUOTE(GVAR(varName)) in ACE_DEBUG_NAMESPACE)) then { PUSH(ACE_DEBUG_NAMESPACE, QUOTE(GVAR(varName))); }; GVAR(varName)
 #define DVAR(varName) 	if(isNil "ACE_DEBUG_NAMESPACE") then { ACE_DEBUG_NAMESPACE = []; }; if(!(QUOTE(varName) in ACE_DEBUG_NAMESPACE)) then { PUSH(ACE_DEBUG_NAMESPACE, QUOTE(varName)); }; varName
 #define DFUNC(var1) TRIPLES(ADDON,fnc,var1)
+#define DEFUNC(var1,var2) TRIPLES(DOUBLES(PREFIX,var1),fnc,var2)
+
+#define QFUNC(var1) QUOTE(DFUNC(var1))
+#define QEFUNC(var1,var2) QUOTE(DEFUNC(var1,var2))
 
 #ifdef DISABLE_COMPILE_CACHE
 	#define PREP(fncName) DFUNC(fncName) = compile preprocessFileLineNumbers QUOTE(PATHTOF(functions\DOUBLES(fnc,fncName).sqf))

addons/missileguidance/config.cpp

@@ -5,7 +5,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = REQUIRED_VERSION;
-		requiredAddons[] = { "uo_main", "ace__laser", "a3_ui_f" };
+		requiredAddons[] = { "ace_common", "ace_laser" };
 		version = VERSION;
 	};
 };