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

Code Cleanup Medical Menu Module.

Browse Source
This commit is contained in:
jokoho48 2015-08-22 22:33:15 +02:00
parent 7d2ca74402
commit 4d81e4a99e
7 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/medical_menu/functions/fnc_canOpenMenu.sqf
View File

@ -21,4 +21,4 @@ params ["_caller", "_target"];
if !(GVAR(allow) == 1 || (GVAR(allow) == 2 && {vehicle _caller != _caller || vehicle _target != _target} && {alive ACE_player})) exitwith {false};
if !(GVAR(useMenu) == 1 || (GVAR(useMenu) == 2 && {vehicle _caller != _caller || vehicle _target != _target} && {alive ACE_player})) exitwith {false};
true;
true

2
addons/medical_menu/functions/fnc_collectActions.sqf
View File

@ -33,7 +33,7 @@ _fnc_compileActionsLevel = {
_actions pushBack [_displayName, _category, compile _condition, compile _statement];
};
nil
}count ("true" configClasses _config);
} count ("true" configClasses _config);
_actions // return
};

10
addons/medical_menu/functions/fnc_handleUI_DisplayOptions.sqf
View File

@ -38,11 +38,11 @@ if (_name isEqualTo "toggle") exitwith {
};
GVAR(INTERACTION_TARGET_PREVIOUS) = GVAR(INTERACTION_TARGET);
[_newTarget] spawn {
closeDialog 0;
sleep 0.1;
closeDialog 0;
[{
[_this select 0] call FUNC(openMenu);
};
}, [_newTarget], 0.1] call EFUNC(common,waitAndExecute);
};
// Clean the dropdown options list from all actions
@ -77,7 +77,7 @@ if (_name isEqualTo "triage") exitwith {
};
_triageCardTexts pushback format["%1x - %2 (%3m)", _amount, _message, round((ACE_time - _time) / 60)];
nil;
}count _log;
} count _log;
if (count _triageCardTexts == 0) exitwith {
lbAdd [212,(localize ELSTRING(medical,TriageCard_NoEntry))];

7
addons/medical_menu/functions/fnc_onMenuOpen.sqf
View File

@ -61,8 +61,9 @@ disableSerialization;
(_display displayCtrl 1) ctrlSetText format ["%1", [_target] call EFUNC(common,getName)];
setMousePosition [0.4, 0.4];
[QGVAR(onMenuOpen), "onEachFrame", {
params ["_display"];
GVAR(MenuPFHID) = [{
(_this select 0) params ["_display"];
if (isNull GVAR(INTERACTION_TARGET)) then {
GVAR(INTERACTION_TARGET) = ACE_player;
};
@ -79,6 +80,6 @@ setMousePosition [0.4, 0.4];
["displayTextStructured", [ACE_player], [[ELSTRING(medical,DistanceToFar), [_target] call EFUNC(common,getName)], 1.75, ACE_player]] call EFUNC(common,targetEvent);
};
}, [_display]] call BIS_fnc_addStackedEventHandler;
}, 0, [_display]] call CBA_fnc_addPerFrameHandler;
["Medical_onMenuOpen", [ACE_player, _interactionTarget]] call EFUNC(common,localEvent);

4
addons/medical_menu/functions/fnc_openMenu.sqf
View File

@ -27,7 +27,7 @@ if (dialog || isNull _interactionTarget) exitwith {
closeDialog 314412;
_handled = true;
};
_handled
};
@ -36,4 +36,4 @@ GVAR(INTERACTION_TARGET) = _interactionTarget;
createDialog QGVAR(medicalMenu);
GVAR(lastOpenedOn) = ACE_time;
true
true

12
addons/medical_menu/functions/fnc_updateInformationLists.sqf
View File

@ -21,16 +21,18 @@ params ["_display", "_genericMessages", "_allInjuryTexts"];
_lbCtrl = _display displayCtrl 213;
lbClear _lbCtrl;
{
_lbCtrl lbAdd (_x select 0);
_lbCtrl lbSetColor [_forEachIndex, _x select 1];
_x params ["_add", "_color"];
_lbCtrl lbAdd _add;
_lbCtrl lbSetColor [_forEachIndex, _color];
} forEach _genericMessages;
_amountOfGeneric = count _genericMessages;
{
_lbCtrl lbAdd (_x select 0);
_lbCtrl lbSetColor [_forEachIndex + _amountOfGeneric, _x select 1];
_x params ["_add", "_Color"];
_lbCtrl lbAdd _add;
_lbCtrl lbSetColor [_forEachIndex + _amountOfGeneric, _color];
} forEach _allInjuryTexts;
if (count _allInjuryTexts == 0) then {
if !(_allInjuryTexts isEqualTo []) then {
_lbCtrl lbAdd localize ELSTRING(medical,NoInjuriesBodypart);
};

4
addons/medical_menu/ui/menu.hpp
View File

@ -4,7 +4,7 @@ class GVAR(medicalMenu) {
idd = 314412;
movingEnable = true;
onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(medicalMenu)), _this select 0)]; [ARR_2(QUOTE(QGVAR(id)), true)] call EFUNC(common,blurScreen); [_this select 0] call FUNC(onMenuOpen););
onUnload = QUOTE([ARR_2(QUOTE(QGVAR(id)), false)] call EFUNC(common,blurScreen); [ARR_2(QUOTE(QGVAR(onMenuOpen)), 'onEachFrame')] call BIS_fnc_removeStackedEventHandler;);
onUnload = QUOTE([ARR_2(QUOTE(QGVAR(id)), false)] call EFUNC(common,blurScreen); [GVAR(MenuPFHID)] call CBA_fnc_removePerFrameHandler;);
class controlsBackground {
class HeaderBackground: ACE_gui_backgroundBase{
idc = -1;
@ -567,4 +567,4 @@ class GVAR(medicalMenu) {
action = QUOTE([] call FUNC(handleUI_dropDownTriageCard); [ARR_2(GVAR(INTERACTION_TARGET),4)] call FUNC(setTriageStatus););
};
};
};
};