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

Minor arsenal fixes (#6025)

Browse Source 
* Change "ok" to "apply" while in 3DEN

* Move execNextFrame from initBox's action to openBox

This was done in order to avoid crashes on custom actions
This commit is contained in:
Josuan Albin 2018-01-06 01:30:33 +01:00 committed by jonpas
parent dbe6a04e8a
commit 3839f2f5fc
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/arsenal/functions/fnc_initBox.sqf
View File

@ -44,7 +44,7 @@ if (_global && {isMultiplayer} && {{_object in _x} count GVAR(EHIDArray) == 0})
{
params ["_target", "_player"];
[{[_this select 0, _this select 1] call FUNC(openBox)}, [_target, _player]] call CBA_fnc_execNextFrame;
[_target, _player] call FUNC(openBox);
},
{
params ["_target", "_player"];

2
addons/arsenal/functions/fnc_onArsenalOpen.sqf
View File

@ -259,7 +259,7 @@ if (is3DEN) then {
];
_buttonCloseCtrl = _display displayCtrl IDC_menuBarClose;
_buttonCloseCtrl ctrlSetText (localize "STR_DISP_OK");
_buttonCloseCtrl ctrlSetText (localize "str_ui_debug_but_apply");
};
//--------------- Prepare the left panel

7
addons/arsenal/functions/fnc_openBox.sqf
View File

@ -50,4 +50,9 @@ if (_mode) then {
};
GVAR(center) = _center;
_displayToUse createDisplay QGVAR(display);
if (is3DEN) then {
_displayToUse createDisplay QGVAR(display);
} else {
[{(_this select 0) createDisplay (_this select 1)}, [_displayToUse, QGVAR(display)]] call CBA_fnc_execNextFrame;
};