Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5995 from Dystopian/add_macro_brackets

Browse Source 
Add parentheses to GETVAR macros
This commit is contained in:
commy2 2017-12-30 19:15:00 +01:00 committed by GitHub
commit 89e1fc243a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/captives/XEH_postInit.sqf
View File

@ -52,6 +52,6 @@ if (!hasInterface) exitWith {};
{false}, {false},
[DIK_F1, [true, false, false]], true] call CBA_fnc_addKeybind; // Shift + F1 [DIK_F1, [true, false, false]], true] call CBA_fnc_addKeybind; // Shift + F1
["isNotEscorting", {!(GETVAR(_this select 0,GVAR(isEscorting),false))}] call EFUNC(common,addCanInteractWithCondition); ["isNotEscorting", {!GETVAR(_this select 0,GVAR(isEscorting),false)}] call EFUNC(common,addCanInteractWithCondition);
["isNotHandcuffed", {!(GETVAR(_this select 0,GVAR(isHandcuffed),false))}] call EFUNC(common,addCanInteractWithCondition); ["isNotHandcuffed", {!GETVAR(_this select 0,GVAR(isHandcuffed),false)}] call EFUNC(common,addCanInteractWithCondition);
["isNotSurrendering", {!(GETVAR(_this select 0,GVAR(isSurrendering),false))}] call EFUNC(common,addCanInteractWithCondition); ["isNotSurrendering", {!GETVAR(_this select 0,GVAR(isSurrendering),false)}] call EFUNC(common,addCanInteractWithCondition);

2
addons/captives/functions/fnc_doEscortCaptive.sqf
View File

@ -32,7 +32,7 @@ if (_state) then {
//Add Actionmenu to release captive //Add Actionmenu to release captive
private _actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", localize LSTRING(StopEscorting)], private _actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", localize LSTRING(StopEscorting)],
{[(_this select 0), ((_this select 0) getVariable [QGVAR(escortedUnit), objNull]), false] call FUNC(doEscortCaptive);}, {[(_this select 0), ((_this select 0) getVariable [QGVAR(escortedUnit), objNull]), false] call FUNC(doEscortCaptive);},
nil, 20, false, true, "", QUOTE(!isNull (GETVAR(_target,QGVAR(escortedUnit),objNull)))]; nil, 20, false, true, "", QUOTE(!isNull GETVAR(_target,QGVAR(escortedUnit),objNull))];
[{ [{
params ["_args", "_pfID"]; params ["_args", "_pfID"];

2
addons/common/functions/fnc_errorMessage.sqf
View File

@ -38,7 +38,7 @@ if (_textMessage isEqualType "") then {
_textMessage = parseText _textMessage; _textMessage = parseText _textMessage;
}; };
(ARR_SELECT(_this,4,call BIS_fnc_displayMission)) createDisplay "RscDisplayCommonMessagePause"; ARR_SELECT(_this,4,call BIS_fnc_displayMission) createDisplay "RscDisplayCommonMessagePause";
private _display = uiNamespace getVariable "RscDisplayCommonMessage_display"; private _display = uiNamespace getVariable "RscDisplayCommonMessage_display";
private _ctrlRscMessageBox = _display displayCtrl 2351; private _ctrlRscMessageBox = _display displayCtrl 2351;

14
addons/common/functions/fnc_isFeatureCameraActive.sqf
View File

@ -26,11 +26,11 @@
!( !(
isNull curatorCamera && // Curator isNull curatorCamera && // Curator
{!(GETMVAR(EGVAR(spectator,isSet),false))} && // ACE Spectator {!GETMVAR(EGVAR(spectator,isSet),false)} && // ACE Spectator
{isNull (GETMVAR(BIS_EGSpectatorCamera_camera, objNull))} && // BIS Nexus Spectator {isNull GETMVAR(BIS_EGSpectatorCamera_camera, objNull)} && // BIS Nexus Spectator
{isNull (GETUVAR(BIS_fnc_arsenal_cam, objNull))} && // Arsenal camera {isNull GETUVAR(BIS_fnc_arsenal_cam, objNull)} && // Arsenal camera
{isNull (GETMVAR(BIS_fnc_establishingShot_fakeUAV, objNull))} && // Establishing shot camera {isNull GETMVAR(BIS_fnc_establishingShot_fakeUAV, objNull)} && // Establishing shot camera
{isNull (GETMVAR(BIS_fnc_camera_cam, objNull))} && // Splendid camera {isNull GETMVAR(BIS_fnc_camera_cam, objNull)} && // Splendid camera
{isNull (GETUVAR(BIS_fnc_animViewer_cam, objNull))} && // Animation viewer camera {isNull GETUVAR(BIS_fnc_animViewer_cam, objNull)} && // Animation viewer camera
{isNull (GETMVAR(BIS_DEBUG_CAM, objNull))} // Classic camera {isNull GETMVAR(BIS_DEBUG_CAM, objNull)} // Classic camera
) // return ) // return

2
addons/goggles/XEH_postInit.sqf
View File

@ -4,7 +4,7 @@ if (!hasInterface) exitWith {};
["ACE3 Common", QGVAR(wipeGlasses), localize LSTRING(WipeGlasses), { ["ACE3 Common", QGVAR(wipeGlasses), localize LSTRING(WipeGlasses), {
if (GVAR(effects) != 2) exitWith {false}; //Can only wipe if full effects setting is set if (GVAR(effects) != 2) exitWith {false}; //Can only wipe if full effects setting is set
if (!(GETVAR(ace_player,ACE_isUnconscious,false))) exitWith { if (!GETVAR(ace_player,ACE_isUnconscious,false)) exitWith {
call FUNC(clearGlasses); call FUNC(clearGlasses);
true true
}; };

2
addons/goggles/script_component.hpp
View File

@ -37,6 +37,6 @@
#define DBULLETS 2 #define DBULLETS 2
#define DAMOUNT 3 #define DAMOUNT 3
#define GLASSDISPLAY (GETUVAR(GVAR(Display),displayNull)) #define GLASSDISPLAY GETUVAR(GVAR(Display),displayNull)
#define CLAMP(x,low,high) (if(x > high)then{high}else{if(x < low)then{low}else{x}}) #define CLAMP(x,low,high) (if(x > high)then{high}else{if(x < low)then{low}else{x}})

12
addons/main/script_macros.hpp
View File

@ -20,11 +20,11 @@
#define SETPVAR_SYS(var1,var2) setVariable [ARR_3(QUOTE(var1),var2,true)] #define SETPVAR_SYS(var1,var2) setVariable [ARR_3(QUOTE(var1),var2,true)]
#undef GETVAR #undef GETVAR
#define GETVAR(var1,var2,var3) var1 GETVAR_SYS(var2,var3) #define GETVAR(var1,var2,var3) (var1 GETVAR_SYS(var2,var3))
#define GETMVAR(var1,var2) missionNamespace GETVAR_SYS(var1,var2) #define GETMVAR(var1,var2) (missionNamespace GETVAR_SYS(var1,var2))
#define GETUVAR(var1,var2) uiNamespace GETVAR_SYS(var1,var2) #define GETUVAR(var1,var2) (uiNamespace GETVAR_SYS(var1,var2))
#define GETPRVAR(var1,var2) profileNamespace GETVAR_SYS(var1,var2) #define GETPRVAR(var1,var2) (profileNamespace GETVAR_SYS(var1,var2))
#define GETPAVAR(var1,var2) parsingNamespace GETVAR_SYS(var1,var2) #define GETPAVAR(var1,var2) (parsingNamespace GETVAR_SYS(var1,var2))
#undef SETVAR #undef SETVAR
#define SETVAR(var1,var2,var3) var1 SETVAR_SYS(var2,var3) #define SETVAR(var1,var2,var3) var1 SETVAR_SYS(var2,var3)
@ -37,7 +37,7 @@
#define GETGVAR(var1,var2) GETMVAR(GVAR(var1),var2) #define GETGVAR(var1,var2) GETMVAR(GVAR(var1),var2)
#define GETEGVAR(var1,var2,var3) GETMVAR(EGVAR(var1,var2),var3) #define GETEGVAR(var1,var2,var3) GETMVAR(EGVAR(var1,var2),var3)
#define ARR_SELECT(ARRAY,INDEX,DEFAULT) if (count ARRAY > INDEX) then {ARRAY select INDEX} else {DEFAULT} #define ARR_SELECT(ARRAY,INDEX,DEFAULT) (if (count ARRAY > INDEX) then {ARRAY select INDEX} else {DEFAULT})
#define MACRO_ADDWEAPON(WEAPON,COUNT) class _xx_##WEAPON { \ #define MACRO_ADDWEAPON(WEAPON,COUNT) class _xx_##WEAPON { \

2
addons/parachute/functions/fnc_handleReserve.sqf
View File

@ -25,7 +25,7 @@ if (
{GETVAR(_unit,GVAR(hasReserve),false)} {GETVAR(_unit,GVAR(hasReserve),false)}
) then { ) then {
// Case where unit has just opened parachute and reserve should be added // Case where unit has just opened parachute and reserve should be added
_unit addBackpackGlobal (GETVAR(_unit,GVAR(backpackClass),"ACE_NonSteerableReserveParachute")); _unit addBackpackGlobal GETVAR(_unit,GVAR(backpackClass),"ACE_NonSteerableReserveParachute");
SETVAR(vehicle _unit,GVAR(canCut),true); // Mark the parachute cuttable since reserve is present SETVAR(vehicle _unit,GVAR(canCut),true); // Mark the parachute cuttable since reserve is present
} else { } else {
// Case where inventory has changed otherwise (including when reserve is added) // Case where inventory has changed otherwise (including when reserve is added)

2
addons/tacticalladder/functions/fnc_handleInteractMenuOpened.sqf
View File

@ -17,6 +17,6 @@
params ["_unit"]; params ["_unit"];
if (!isNull (GETMVAR(GVAR(ladder),objNull)) && {GVAR(ladder) in attachedObjects _unit}) then { if (!isNull GETMVAR(GVAR(ladder),objNull) && {GVAR(ladder) in attachedObjects _unit}) then {
[_unit, GVAR(ladder)] call FUNC(cancelTLdeploy); [_unit, GVAR(ladder)] call FUNC(cancelTLdeploy);
}; };

2
addons/tacticalladder/functions/fnc_handleKilled.sqf
View File

@ -17,6 +17,6 @@
params ["_unit"]; params ["_unit"];
if (!isNull (GETMVAR(ladder,objNull)) && {GVAR(ladder) in attachedObjects _unit}) then { if (!isNull GETMVAR(ladder,objNull) && {GVAR(ladder) in attachedObjects _unit}) then {
[_unit, GVAR(ladder)] call FUNC(cancelTLdeploy); [_unit, GVAR(ladder)] call FUNC(cancelTLdeploy);
}; };

2
addons/tacticalladder/functions/fnc_handlePlayerChanged.sqf
View File

@ -16,7 +16,7 @@
*/ */
#include "script_component.hpp" #include "script_component.hpp"
if (isNull (GETGVAR(ladder,objNull))) exitWith {}; if (isNull GETGVAR(ladder,objNull)) exitWith {};
params ["_newPlayer", "_oldPlayer"]; params ["_newPlayer", "_oldPlayer"];

2
addons/tacticalladder/functions/fnc_handleUnconscious.sqf
View File

@ -19,6 +19,6 @@ params ["_unit"];
if (!local _unit) exitWith {}; if (!local _unit) exitWith {};
if (!isNull (GETMVAR(ladder,objNull)) && {GVAR(ladder) in attachedObjects _unit}) then { if (!isNull GETMVAR(ladder,objNull) && {GVAR(ladder) in attachedObjects _unit}) then {
[_unit, GVAR(ladder)] call FUNC(cancelTLdeploy); [_unit, GVAR(ladder)] call FUNC(cancelTLdeploy);
}; };