diff --git a/addons/arsenal/defines.hpp b/addons/arsenal/defines.hpp index 0f2b3ff62a..60b99a99f6 100644 --- a/addons/arsenal/defines.hpp +++ b/addons/arsenal/defines.hpp @@ -18,6 +18,7 @@ #define IDC_totalWeightText 801 #define IDC_message 9 #define IDC_menuBar 10 +#define IDC_menuBarClose 1001 #define IDC_infoBox 11 #define IDC_infoBackground 1101 #define IDC_infoName 1102 @@ -329,4 +330,4 @@ _buttonCurrentMag2Ctrl ctrlCommit FADE_DELAY;\ _contentPanelCtrl lnbSetPicture [[_newRow, 6], getText (configFile >> "cfgWeapons" >> ((_loadout select 4) select 0) >> "picture")];\ _contentPanelCtrl lnbSetPicture [[_newRow, 7], getText (configFile >> "cfgVehicles" >> ((_loadout select 5) select 0) >> "picture")];\ _contentPanelCtrl lnbSetPicture [[_newRow, 8], getText (configFile >> "cfgWeapons" >> (_loadout select 6) >> "picture")];\ - _contentPanelCtrl lnbSetPicture [[_newRow, 9], getText (configFile >> "cfgGlasses" >> (_loadout select 7) >> "picture")]; \ No newline at end of file + _contentPanelCtrl lnbSetPicture [[_newRow, 9], getText (configFile >> "cfgGlasses" >> (_loadout select 7) >> "picture")]; diff --git a/addons/arsenal/missions/Arsenal.VR/XEH_postInit.sqf b/addons/arsenal/missions/Arsenal.VR/XEH_postInit.sqf index 84a84778a5..e9fde7c172 100644 --- a/addons/arsenal/missions/Arsenal.VR/XEH_postInit.sqf +++ b/addons/arsenal/missions/Arsenal.VR/XEH_postInit.sqf @@ -60,6 +60,9 @@ cba_diagnostic_projectileMaxLines = 10; true }; }]; + + private _buttonClose = _display displayCtrl IDC_menuBarClose; + _buttonClose ctrlSetText localize "str_a3_rscdisplayarsenal_buttonok"; } call CBA_fnc_execNextFrame; }] call CBA_fnc_addEventHandler; diff --git a/addons/arsenal/missions/Arsenal.VR/fnc_createTarget.sqf b/addons/arsenal/missions/Arsenal.VR/fnc_createTarget.sqf index d33d669ae1..7ff1ea58e6 100644 --- a/addons/arsenal/missions/Arsenal.VR/fnc_createTarget.sqf +++ b/addons/arsenal/missions/Arsenal.VR/fnc_createTarget.sqf @@ -24,13 +24,13 @@ _target setSpeedMode "LIMITED"; _target disableAI "TARGET"; _target disableAI "AUTOTARGET"; _target allowFleeing 0; -_target setSpeaker "Base"; +_target setSpeaker "BASE"; [{ params ["_target", "_time"]; - if (speaker _target == "Base") exitWith {time > _time}; - _target setSpeaker "Base"; + if (speaker _target == "BASE") exitWith {time > _time}; + _target setSpeaker "BASE"; false }, {}, [_target, time + 1]] call CBA_fnc_waitUntilAndExecute; diff --git a/addons/arsenal/ui/RscAttributes.hpp b/addons/arsenal/ui/RscAttributes.hpp index b1faccfd70..14bee4f6a5 100644 --- a/addons/arsenal/ui/RscAttributes.hpp +++ b/addons/arsenal/ui/RscAttributes.hpp @@ -197,7 +197,7 @@ class GVAR(display) { onButtonClick = QUOTE([ctrlparent (_this select 0)] call FUNC(buttonImport)); }; class buttonClose: ctrlButtonClose { - idc = -1; + idc = IDC_menuBarClose; colorBackground[] = {0,0,0,0.8}; x = QUOTE(170 * GRID_W); y = QUOTE(0);