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

rename 'close' to 'try' in arsenal

Browse Source
This commit is contained in:
commy2 2017-12-24 20:41:13 +01:00
parent 4fb556d7ac
commit 057cc8d6d5
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/arsenal/defines.hpp
View File

@ -18,6 +18,7 @@
#define IDC_totalWeightText 801 #define IDC_totalWeightText 801
#define IDC_message 9 #define IDC_message 9
#define IDC_menuBar 10 #define IDC_menuBar 10
#define IDC_menuBarClose 1001
#define IDC_infoBox 11 #define IDC_infoBox 11
#define IDC_infoBackground 1101 #define IDC_infoBackground 1101
#define IDC_infoName 1102 #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, 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, 7], getText (configFile >> "cfgVehicles" >> ((_loadout select 5) select 0) >> "picture")];\
_contentPanelCtrl lnbSetPicture [[_newRow, 8], getText (configFile >> "cfgWeapons" >> (_loadout select 6) >> "picture")];\ _contentPanelCtrl lnbSetPicture [[_newRow, 8], getText (configFile >> "cfgWeapons" >> (_loadout select 6) >> "picture")];\
_contentPanelCtrl lnbSetPicture [[_newRow, 9], getText (configFile >> "cfgGlasses" >> (_loadout select 7) >> "picture")]; _contentPanelCtrl lnbSetPicture [[_newRow, 9], getText (configFile >> "cfgGlasses" >> (_loadout select 7) >> "picture")];

3
addons/arsenal/missions/Arsenal.VR/XEH_postInit.sqf
View File

@ -60,6 +60,9 @@ cba_diagnostic_projectileMaxLines = 10;
true true
}; };
}]; }];
private _buttonClose = _display displayCtrl IDC_menuBarClose;
_buttonClose ctrlSetText localize "str_a3_rscdisplayarsenal_buttonok";
} call CBA_fnc_execNextFrame; } call CBA_fnc_execNextFrame;
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;

6
addons/arsenal/missions/Arsenal.VR/fnc_createTarget.sqf
View File

@ -24,13 +24,13 @@ _target setSpeedMode "LIMITED";
_target disableAI "TARGET"; _target disableAI "TARGET";
_target disableAI "AUTOTARGET"; _target disableAI "AUTOTARGET";
_target allowFleeing 0; _target allowFleeing 0;
_target setSpeaker "Base"; _target setSpeaker "BASE";
[{ [{
params ["_target", "_time"]; params ["_target", "_time"];
if (speaker _target == "Base") exitWith {time > _time}; if (speaker _target == "BASE") exitWith {time > _time};
_target setSpeaker "Base"; _target setSpeaker "BASE";
false false
}, {}, [_target, time + 1]] call CBA_fnc_waitUntilAndExecute; }, {}, [_target, time + 1]] call CBA_fnc_waitUntilAndExecute;

2
addons/arsenal/ui/RscAttributes.hpp
View File

@ -197,7 +197,7 @@ class GVAR(display) {
onButtonClick = QUOTE([ctrlparent (_this select 0)] call FUNC(buttonImport)); onButtonClick = QUOTE([ctrlparent (_this select 0)] call FUNC(buttonImport));
}; };
class buttonClose: ctrlButtonClose { class buttonClose: ctrlButtonClose {
idc = -1; idc = IDC_menuBarClose;
colorBackground[] = {0,0,0,0.8}; colorBackground[] = {0,0,0,0.8};
x = QUOTE(170 * GRID_W); x = QUOTE(170 * GRID_W);
y = QUOTE(0); y = QUOTE(0);