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

common: various fixes. Fix #33

Browse Source
This commit is contained in:
Nicolás Badano 2015-01-15 14:41:22 -03:00
parent 3e9785e145
commit 8f31dea752
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/common/functions/fnc_closeDialogIfTargetMoves.sqf
View File

@ -41,8 +41,8 @@ _this spawn {
waitUntil { waitUntil {
if (call _fnc_check) then { if (call _fnc_check) then {
closeDialog 0; closeDialog 0;
call ACE_Interaction_fnc_hideMenu; call EFUNC(interaction,hideMenu);
}; };
(isNil "ACE_Interaction_MainButton" && !dialog) || {!isNull (uiNamespace getVariable [QGVAR(dlgDisableMouse), displayNull])} //Exit loop if DisableMouse dialog open (isNil QEGVAR(interaction,MainButton) && !dialog) || {!isNull (uiNamespace getVariable [QGVAR(dlgDisableMouse), displayNull])} //Exit loop if DisableMouse dialog open
}; };
}; };

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

@ -1,7 +1,7 @@
/* /*
* Author: commy2 * Author: commy2
* *
* Set all keys from the 'GVAR(Default_Keys)' base class that are missing in the current user profile. * Set all keys from the 'ACE_Default_Keys' base class that are missing in the current user profile.
* *
* Argument: * Argument:
* 1: Overwrite existing key binds? (Bool) * 1: Overwrite existing key binds? (Bool)

6
addons/common/scripts/Version/checkVersionNumber.sqf
View File

@ -13,7 +13,7 @@ if (missionNamespace getVariable ["ACE_Version_CheckAll", false]) then {
} forEach activatedAddons; } forEach activatedAddons;
} else { } else {
{ {
if (toLower _x find "ACE_" == 0) then { if (toLower _x find "ace_" == 0) then {
_files pushBack _x; _files pushBack _x;
}; };
} forEach activatedAddons; } forEach activatedAddons;
@ -31,7 +31,7 @@ if (isServer) then {
diag_log text format ["[ACE] Server: ACE_Common is Version %1.", _versionMain]; diag_log text format ["[ACE] Server: ACE_Common is Version %1.", _versionMain];
{ {
if (toLower _x find "ACE_" == 0) then {// if (toLower _x find "ace_" == 0) then {//
_version = _versions select _forEachIndex; _version = _versions select _forEachIndex;
if (_version != _versionMain) then { if (_version != _versionMain) then {
diag_log text format ["[ACE] Server: %1 is Version %2.", _x, _version]; diag_log text format ["[ACE] Server: %1 is Version %2.", _x, _version];
@ -45,7 +45,7 @@ if (isServer) then {
diag_log text format ["[ACE] Client: ACE_Common is Version %1.", _versionMain]; diag_log text format ["[ACE] Client: ACE_Common is Version %1.", _versionMain];
{ {
if (toLower _x find "ACE_" == 0) then {// if (toLower _x find "ace_" == 0) then {//
_version = _versions select _forEachIndex; _version = _versions select _forEachIndex;
if (_version != _versionMain) then { if (_version != _versionMain) then {
diag_log text format ["[ACE] Client: %1 is Version %2.", _x, _version]; diag_log text format ["[ACE] Client: %1 is Version %2.", _x, _version];

14
addons/common/scripts/editKey.sqf
View File

@ -35,23 +35,25 @@ for "_index1" from 10 to 13 do {(_dlgMenuDialog displayCtrl _index1) ctrlEnable
(_dlgMenuDialog displayCtrl 30) ctrlSetText _displayName; (_dlgMenuDialog displayCtrl 30) ctrlSetText _displayName;
GVAR(keysetDefault) = compile format [ GVAR(keysetDefault) = compile format [
"_configFile = configFile >> 'GVAR(Default_Keys)' >> '%1'; "_configFile = configFile >> 'ACE_Default_Keys' >> '%1';
_key = getNumber (_configFile >> 'Key'); _key = getNumber (_configFile >> 'Key');
_shft = getNumber (_configFile >> 'Shift') == 1; _shft = getNumber (_configFile >> 'Shift') == 1;
_ctrl = getNumber (_configFile >> 'Control') == 1; _ctrl = getNumber (_configFile >> 'Control') == 1;
_alt = getNumber (_configFile >> 'Alt') == 1; _alt = getNumber (_configFile >> 'Alt') == 1;
_keyCode = [_key, _shft, _ctrl, _alt] call FUNC(convertKeyCode); _keyCode = [_key, _shft, _ctrl, _alt] call %2;
GVAR(keyNewTemp) = [_key, [_shft, _ctrl, _alt], _keyCode];", %3 = [_key, [_shft, _ctrl, _alt], _keyCode];",
_action _action,
QFUNC(convertKeyCode),
QGVAR(keyNewTemp)
]; ];
_description = ctrlText _ctrlMenuDialog; _description = ctrlText _ctrlMenuDialog;
//_ctrlMenuDialog ctrlSetText ".."; //_ctrlMenuDialog ctrlSetText "..";
_ehid_keydown = _dlgMenuDialog displayAddEventHandler ["KeyDown", "_this call GVAR(keyInput)"]; _ehid_keydown = _dlgMenuDialog displayAddEventHandler ["KeyDown", QUOTE( _this call GVAR(keyInput) )];
_ehid_keyup = _dlgMenuDialog displayAddEventHandler ["KeyUp", "_this call GVAR(keyRelease)"]; _ehid_keyup = _dlgMenuDialog displayAddEventHandler ["KeyUp", QUOTE( _this call GVAR(keyRelease) )];
waitUntil { waitUntil {
if (count GVAR(keyNewTemp) > 0) then { if (count GVAR(keyNewTemp) > 0) then {

2
addons/common/scripts/nextKeys.sqf
View File

@ -26,7 +26,7 @@ if (GVAR(MenuPage) == _countPages - 1) then {
for "_index" from OFFSET_1 to (OFFSET_1 + 19) do {(_dlgMenuDialog displayCtrl _index) ctrlShow false}; for "_index" from OFFSET_1 to (OFFSET_1 + 19) do {(_dlgMenuDialog displayCtrl _index) ctrlShow false};
for "_index" from OFFSET_2 to (OFFSET_2 + 19) do {(_dlgMenuDialog displayCtrl _index) ctrlShow false}; for "_index" from OFFSET_2 to (OFFSET_2 + 19) do {(_dlgMenuDialog displayCtrl _index) ctrlShow false};
_config = configFile >> QGVAR(Options); _config = configFile >> "ACE_Options";
_count = count _config; _count = count _config;
_offset = 0; _offset = 0;

2
addons/common/scripts/openMenu.sqf
View File

@ -22,7 +22,7 @@ _dlgMenuDialog = uiNamespace getVariable QGVAR(MenuDialog);
_ehid_keydown = _dlgMenuDialog displayAddEventHandler ["KeyDown", "_this select 1 > 1"]; _ehid_keydown = _dlgMenuDialog displayAddEventHandler ["KeyDown", "_this select 1 > 1"];
_ehid_keyup = _dlgMenuDialog displayAddEventHandler ["KeyUp", "_this select 1 > 1"]; _ehid_keyup = _dlgMenuDialog displayAddEventHandler ["KeyUp", "_this select 1 > 1"];
_config = configFile >> QGVAR(Default_Keys); _config = configFile >> "ACE_Default_Keys";
_count = count _config; _count = count _config;
_countPages = ceil (_count / 20) + 1; _countPages = ceil (_count / 20) + 1;