Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Interaction Menu - Add triage colors to icons at passengers list #8366

Merged
merged 2 commits into from
Oct 11, 2021
Merged

Interaction Menu - Add triage colors to icons at passengers list #8366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebad14e
Add triage colors to icons at passengers list
severgun Aug 7, 2021
a613d5c
Add isModLoaded check for ace_medical_gui
severgun Oct 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions addons/interaction/functions/fnc_addPassengersActions.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ private _actions = [];
[
format ["%1", _unit],
[_unit, true] call EFUNC(common,getName),
_icon,
[_icon, "#FFFFFF"],
{
//statement (Run on hover) - reset the cache so we will insert actions immedietly when hovering over new unit
TRACE_2("Cleaning Cache",_target,vehicle _target);
Expand All @@ -57,7 +57,8 @@ private _actions = [];
[_unit],
{[0, 0, 0]},
2,
[false,false,false,true,false] //add run on hover (4th bit true)
[false,false,false,true,false], //add run on hover (4th bit true)
{if (["ace_medical_gui"] call EFUNC(common,isModLoaded)) then {call EFUNC(medical_gui,modifyActionTriageLevel)}}
] call EFUNC(interact_menu,createAction),
[],
_unit
Expand Down
2 changes: 1 addition & 1 deletion addons/medical_gui/functions/fnc_modifyActionTriageLevel.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* None
*
* Example:
* [cursorObject, player, [], []] call ace_interaction_fnc_modifyActionTriageLevel
* [cursorObject, player, [], []] call ace_medical_gui_fnc_modifyActionTriageLevel
*
* Public: No
*/
Expand Down