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

conform isnil checking: interact_menu

Browse Source
This commit is contained in:
Whigital 2020-02-11 23:43:08 +01:00
parent b8329e8937
commit 1def9cbcb7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/interact_menu/functions/fnc_compileMenu.sqf
View File

@ -24,7 +24,7 @@ if (_target isEqualType objNull) then {
private _namespace = GVAR(ActNamespace); private _namespace = GVAR(ActNamespace);
// Exit if the action menu is already compiled for this class // Exit if the action menu is already compiled for this class
if !(isNil {_namespace getVariable _objectType}) exitWith {}; if (!isNil {_namespace getVariable _objectType}) exitWith {};
if (_objectType isKindOf "VirtualMan_F") exitWith { // these have config: isPlayableLogic = 1 if (_objectType isKindOf "VirtualMan_F") exitWith { // these have config: isPlayableLogic = 1
TRACE_1("skipping playable logic",_objectType); TRACE_1("skipping playable logic",_objectType);
@ -41,7 +41,7 @@ private _recurseFnc = {
{ {
private _entryCfg = _x; private _entryCfg = _x;
if(isClass _entryCfg) then { if (isClass _entryCfg) then {
private _displayName = getText (_entryCfg >> "displayName"); private _displayName = getText (_entryCfg >> "displayName");
private _distance = _parentDistance; private _distance = _parentDistance;
if (isNumber (_entryCfg >> "distance")) then {_distance = getNumber (_entryCfg >> "distance");}; if (isNumber (_entryCfg >> "distance")) then {_distance = getNumber (_entryCfg >> "distance");};

4
addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
View File

@ -24,7 +24,7 @@ if (_target isEqualType objNull) then {
private _namespace = GVAR(ActSelfNamespace); private _namespace = GVAR(ActSelfNamespace);
// Exit if the action menu is already compiled for this class // Exit if the action menu is already compiled for this class
if !(isNil {_namespace getVariable _objectType}) exitWith {}; if (!isNil {_namespace getVariable _objectType}) exitWith {};
private _recurseFnc = { private _recurseFnc = {
@ -34,7 +34,7 @@ private _recurseFnc = {
{ {
private _entryCfg = _x; private _entryCfg = _x;
if(isClass _entryCfg) then { if (isClass _entryCfg) then {
private _displayName = getText (_entryCfg >> "displayName"); private _displayName = getText (_entryCfg >> "displayName");
private _icon = if (isArray (_entryCfg >> "icon")) then { private _icon = if (isArray (_entryCfg >> "icon")) then {

4
addons/interact_menu/functions/fnc_compileMenuZeus.sqf
View File

@ -16,7 +16,7 @@
*/ */
// Exit if the action menu is already compiled for zeus // Exit if the action menu is already compiled for zeus
if !(isNil {missionNamespace getVariable [QGVAR(ZeusActions), nil]}) exitWith {}; if (!isNil {missionNamespace getVariable [QGVAR(ZeusActions), nil]}) exitWith {};
private _recurseFnc = { private _recurseFnc = {
params ["_actionsCfg"]; params ["_actionsCfg"];
@ -24,7 +24,7 @@ private _recurseFnc = {
{ {
private _entryCfg = _x; private _entryCfg = _x;
if(isClass _entryCfg) then { if (isClass _entryCfg) then {
private _displayName = getText (_entryCfg >> "displayName"); private _displayName = getText (_entryCfg >> "displayName");
private _icon = if (isArray (_entryCfg >> "icon")) then { private _icon = if (isArray (_entryCfg >> "icon")) then {