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

Nametags - Fix ACE nametag drawIcon3D parameter error when player controlled unit dies #8764

Merged
merged 3 commits into from
Mar 7, 2022
Merged

Nametags - Fix ACE nametag drawIcon3D parameter error when player controlled unit dies #8764

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a66fc0
FIX: `_icon` can be `nil`
Vdauphin Dec 30, 2021
baf03ec
Migrate from `if` to `switch`
Vdauphin Jan 7, 2022
5807405
Missing ()
Vdauphin Feb 8, 2022
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
33 changes: 20 additions & 13 deletions addons/nametags/functions/fnc_drawNameTagIcon.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,26 @@ _fnc_parameters = {
params ["_player", "_target", "_alpha", "_heightOffset", "_drawName", "_drawRank", "_drawSoundwave"];

//Set Icon:
private _icon = "";
if (_drawSoundwave) then {
_icon = format [QPATHTOF(UI\soundwave%1.paa), floor random 10];
} else {
if (_drawRank) then {
_icon = _target getVariable "ace_nametags_rankIcon";
if (isNil "_icon" && {rank _target != ""}) then {
_icon = GVAR(factionRanks) getVariable (_target getVariable [QGVAR(faction), faction _target]);
if (!isNil "_icon") then {
_icon = _icon param [ALL_RANKS find rank _target, ""];
} else {
_icon = format ["\A3\Ui_f\data\GUI\Cfg\Ranks\%1_gs.paa", rank _target];
};
private _targetIcon = _target getVariable QGVAR(rankIcon);

private _icon = switch true do {
case _drawSoundwave: {
format [QPATHTOF(UI\soundwave%1.paa), floor random 10]
};

case !_drawRank: {""};
case !isNil "_targetIcon": {_targetIcon};
case (rank _target == ""): {""};

default {
private _targetFaction = _target getVariable [QGVAR(faction), faction _target];
private _customRankIcons = GVAR(factionRanks) getVariable _targetFaction;

if (!isNil "_customRankIcons") then {
_customRankIcons param [ALL_RANKS find rank _target, ""] // return
} else {
// default rank icons
format ["\A3\Ui_f\data\GUI\Cfg\Ranks\%1_gs.paa", rank _target] // return
};
};
};
Expand Down